From 471727f5b96c7bbcc61068f3f78468b7a4b734b7 Mon Sep 17 00:00:00 2001
From: Tobisaninfo <thinkdifferent055@gmail.com>
Date: Thu, 13 Oct 2016 21:39:07 +0200
Subject: [PATCH] Fixed Audio Volume Bug in NativeAudio
---
.../nawin/NativeAudioWinPluginImpl.java | 38 +++++++++---------
.../playpad/nawin/assets/NativeAudio.dll | Bin 6656 -> 6656 bytes
2 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/PlayWallNativeWin/src/de/tobias/playpad/nawin/NativeAudioWinPluginImpl.java b/PlayWallNativeWin/src/de/tobias/playpad/nawin/NativeAudioWinPluginImpl.java
index afd3fdf7..4d49e1dd 100644
--- a/PlayWallNativeWin/src/de/tobias/playpad/nawin/NativeAudioWinPluginImpl.java
+++ b/PlayWallNativeWin/src/de/tobias/playpad/nawin/NativeAudioWinPluginImpl.java
@@ -23,18 +23,18 @@ import net.xeoh.plugins.base.annotations.events.Shutdown;
public class NativeAudioWinPluginImpl implements NativeAudioWinPlugin {
private static final String ASSETS = "de/tobias/playpad/nawin/assets/";
-
+
private static final String NAME = "NativeAudioWin";
private static final String IDENTIFIER = "de.tobias.playpad.nawin.NativeAudioWinPluginImpl";
-
+
private Module module;
private Updatable updatable;
-
+
@PluginLoaded
public void onLoaded(NativeAudioWinPlugin plugin) {
module = new Module(NAME, IDENTIFIER);
updatable = new NativeAudioWinUpdater();
-
+
try {
prepareBridging();
bridgeCsharp();
@@ -50,19 +50,21 @@ public class NativeAudioWinPluginImpl implements NativeAudioWinPlugin {
private void prepareBridging() throws IOException {
App app = ApplicationUtils.getApplication();
- Path resourceFolder = app.getPath(PathType.LIBRARY, "nawin");
- if (Files.notExists(resourceFolder)) {
- Files.createDirectories(resourceFolder);
- }
+ if (!app.isDebug()) {
+ Path resourceFolder = app.getPath(PathType.LIBRARY, "nawin");
+ if (Files.notExists(resourceFolder)) {
+ Files.createDirectories(resourceFolder);
+ }
- copyResource(resourceFolder, ASSETS, "jni4net.j-0.8.8.0.jar");
- copyResource(resourceFolder, ASSETS, "jni4net.n-0.8.8.0.dll");
- copyResource(resourceFolder, ASSETS, "jni4net.n.w32.v40-0.8.8.0.dll");
- copyResource(resourceFolder, ASSETS, "jni4net.n.w64.v40-0.8.8.0.dll");
- copyResource(resourceFolder, ASSETS, "NativeAudio.dll");
- copyResource(resourceFolder, ASSETS, "NativeAudio.j4n.dll");
- copyResource(resourceFolder, ASSETS, "NativeAudio.j4n.jar");
- copyResource(resourceFolder, ASSETS, "NAudio.dll");
+ copyResource(resourceFolder, ASSETS, "jni4net.j-0.8.8.0.jar");
+ copyResource(resourceFolder, ASSETS, "jni4net.n-0.8.8.0.dll");
+ copyResource(resourceFolder, ASSETS, "jni4net.n.w32.v40-0.8.8.0.dll");
+ copyResource(resourceFolder, ASSETS, "jni4net.n.w64.v40-0.8.8.0.dll");
+ copyResource(resourceFolder, ASSETS, "NativeAudio.dll");
+ copyResource(resourceFolder, ASSETS, "NativeAudio.j4n.dll");
+ copyResource(resourceFolder, ASSETS, "NativeAudio.j4n.jar");
+ copyResource(resourceFolder, ASSETS, "NAudio.dll");
+ }
}
private void copyResource(Path resourceFolder, String packageName, String file) throws IOException {
@@ -84,12 +86,12 @@ public class NativeAudioWinPluginImpl implements NativeAudioWinPlugin {
public void onShutdown() {
}
-
+
@Override
public Module getModule() {
return module;
}
-
+
@Override
public Updatable getUpdatable() {
return updatable;
diff --git a/PlayWallNativeWin/src/de/tobias/playpad/nawin/assets/NativeAudio.dll b/PlayWallNativeWin/src/de/tobias/playpad/nawin/assets/NativeAudio.dll
index 66fd392f1b50cfdbf9d1e538c930a588e829ed79..01b901940ded1b6a40154d503aa62e7708484392 100644
GIT binary patch
delta 365
zcmZoLX)u}4!L0b`|HN)t#<Gbk!x>d3Gcu~PzR_b~keRH=q%%2^QJt}7awB8CV1xk!
z7<e!+FfcK&GN^18WU^#r{5IK}S&3hlmq|l}fq_kImWD6`1KZ?uW?g0m28PK~m<t$L
zH?y*2GS_z~g0#0W>}OzO;9!^o<;`XW@zy|jM$CQ;91Lfmyeu&94V1TzX%YhmgQOC~
zlz9x{3>*yVP+ljqC<7;h1(X-YAi%)IumQ}Q#-PYDje(ot)#kVC{EUn%H~-}@W)pa^
zV8V+#Dy~io@1C1lYHRsqvjhJOMjgdR|HDD1GchnQ$S^W6aOg8Ia0oIm1O>YUU-}t*
zLW0ZBp=~C6)#2>vN}E{(IT(d}pkV^il?GxfOjHzOjM!`{bdYf~pU5v}rV4}2f)ei;
ICmOH=07H>Z-~a#s
delta 345
zcmZoLX)u}4!93^T=ZW32jByiJhBNX^W@J=ny`sm!ATwE!NoR5-qdH^C<VMDNK?ef{
zFz{etU|?ckW#HK?$YjaLxM;FBv(n@yX7$Nym<t$LHp{YPGS?R?f|Rx~>}OzO;9zKn
z@@6xGcvGM}BW6Da4u&mIUKW^l1<G5;G>L(Ofl&!!$~=Z}1`Y;(D6f-Ql!22$0m=(w
z5Mbb9m;vTZV^Cz7#=y;RX)`MaKO<w~W>HRKHh~A;LaT~5Pjp)3m{?Vvc<lY=2>uz2
zI&&U=4hNae#K6EH!^pt!L63pqg8&0VP_Rqzr>|$b?us09UhHMKk6ChQ{AL+J4n|%R
qsQ*E_{3aU;Ni#ZZ_7ytFIN5<wVl$t}FJ`6$gUx~x?-?f=umb@0=1o8V
--
GitLab