diff --git a/PlayWallPluginNativeAudio/pom.xml b/PlayWallPluginNativeAudio/pom.xml index 08ba1aee70ec09c06058ef49e271c5b86a94eaf9..9c19fef5bdd21527d3a6d5427a018a21613a8c3d 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 e1e4f762ea4a59db8bc31e317f356f0a0236cae1..0000000000000000000000000000000000000000 --- 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 027684cd29fe04b2616d9cf7a59056077fcc6381..4fde5bfeee9bf9249ec18ecf01097128143cc6c8 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 2443ad5b7b31a1f64b2c67a042d5067de14a3a80..1e2541f90604c072ceb203cb8501ba8311247e57 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 0000000000000000000000000000000000000000..91ad6b0b4369b0d7c6ebe84300dec5f55e3a3b97 --- /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 +