From 0c980d1b3e018074c5951beab62e152a20e96988 Mon Sep 17 00:00:00 2001
From: tobias <thinkdifferent055@gmail.com>
Date: Tue, 5 Mar 2019 20:54:44 +0100
Subject: [PATCH] Fix native audio manifest, settings view, library loading
---
PlayWallPluginNativeAudio/pom.xml | 9 +++++++++
.../src/main/java/META-INF/MANIFEST.MF | 3 ---
.../audio/windows/NativeAudioSettingsViewController.java | 2 +-
.../playpad/plugin/loader/WindowsAudioImplLoader.scala | 2 +-
.../src/main/resources/META-INF/MANIFEST.MF | 3 +++
5 files changed, 14 insertions(+), 5 deletions(-)
delete mode 100644 PlayWallPluginNativeAudio/src/main/java/META-INF/MANIFEST.MF
create mode 100644 PlayWallPluginNativeAudio/src/main/resources/META-INF/MANIFEST.MF
diff --git a/PlayWallPluginNativeAudio/pom.xml b/PlayWallPluginNativeAudio/pom.xml
index 08ba1aee..9c19fef5 100644
--- a/PlayWallPluginNativeAudio/pom.xml
+++ b/PlayWallPluginNativeAudio/pom.xml
@@ -66,6 +66,15 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
</plugins>
</build>
diff --git a/PlayWallPluginNativeAudio/src/main/java/META-INF/MANIFEST.MF b/PlayWallPluginNativeAudio/src/main/java/META-INF/MANIFEST.MF
deleted file mode 100644
index e1e4f762..00000000
--- a/PlayWallPluginNativeAudio/src/main/java/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: . nawin/jni4net.j-0.8.8.0.jar nawin/NativeAudio.j4n.jar
-
diff --git a/PlayWallPluginNativeAudio/src/main/java/de/tobias/playpad/audio/windows/NativeAudioSettingsViewController.java b/PlayWallPluginNativeAudio/src/main/java/de/tobias/playpad/audio/windows/NativeAudioSettingsViewController.java
index 027684cd..4fde5bfe 100644
--- a/PlayWallPluginNativeAudio/src/main/java/de/tobias/playpad/audio/windows/NativeAudioSettingsViewController.java
+++ b/PlayWallPluginNativeAudio/src/main/java/de/tobias/playpad/audio/windows/NativeAudioSettingsViewController.java
@@ -32,7 +32,7 @@ public class NativeAudioSettingsViewController extends AudioHandlerViewControlle
private NativeAudio audioPlayer;
NativeAudioSettingsViewController() {
- super("nawinSettings", "de/tobias/playpad/assets/win/", null);
+ super("nawinSettings", "win", null);
testButton.setGraphic(new FontIcon(FontAwesomeType.PLAY));
diff --git a/PlayWallPluginNativeAudio/src/main/java/de/tobias/playpad/plugin/loader/WindowsAudioImplLoader.scala b/PlayWallPluginNativeAudio/src/main/java/de/tobias/playpad/plugin/loader/WindowsAudioImplLoader.scala
index 2443ad5b..1e2541f9 100644
--- a/PlayWallPluginNativeAudio/src/main/java/de/tobias/playpad/plugin/loader/WindowsAudioImplLoader.scala
+++ b/PlayWallPluginNativeAudio/src/main/java/de/tobias/playpad/plugin/loader/WindowsAudioImplLoader.scala
@@ -18,7 +18,7 @@ class WindowsAudioImplLoader extends AudioModuleLoader {
override def preInit(): Unit = {
val app: App = ApplicationUtils.getApplication
- val resourceFolder = app.getPath(PathType.LIBRARY, "Native")
+ val resourceFolder = app.getPath(PathType.LIBRARY, "NativeAudio")
if (!app.isDebug) {
if (Files.notExists(resourceFolder))
diff --git a/PlayWallPluginNativeAudio/src/main/resources/META-INF/MANIFEST.MF b/PlayWallPluginNativeAudio/src/main/resources/META-INF/MANIFEST.MF
new file mode 100644
index 00000000..91ad6b0b
--- /dev/null
+++ b/PlayWallPluginNativeAudio/src/main/resources/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path: . NativeAudio/jni4net.j-0.8.8.0.jar NativeAudio/NativeAudio.j4n.jar
+
--
GitLab