diff --git a/PlayWallNativeWin/j4n/NativeAudio.dll b/PlayWallNativeWin/j4n/NativeAudio.dll index e85f118b0af0c8c9a03777d25938e76a635adcb1..fff208682998191bb5fd58c8100cada3dd37e35d 100644 Binary files a/PlayWallNativeWin/j4n/NativeAudio.dll and b/PlayWallNativeWin/j4n/NativeAudio.dll differ diff --git a/PlayWallNativeWin/j4n/NativeAudio.j4n.jar b/PlayWallNativeWin/j4n/NativeAudio.j4n.jar index 8f888bc0ebad18acd661a0d0ea694791d69778a4..c88e638822beb9a0d9f267ea0f963a89b43a4175 100644 Binary files a/PlayWallNativeWin/j4n/NativeAudio.j4n.jar and b/PlayWallNativeWin/j4n/NativeAudio.j4n.jar differ diff --git a/PlayWallNativeWin/j4n/build.cmd b/PlayWallNativeWin/j4n/build.cmd index 4c2f0e843e45bfa61339ae55eb6cc142bd066db3..5f40ca806ce1871dbf5428e570ddfc5cce4cc3a7 100644 --- a/PlayWallNativeWin/j4n/build.cmd +++ b/PlayWallNativeWin/j4n/build.cmd @@ -4,7 +4,7 @@ if not exist target\classes mkdir target\classes echo compile classes -javac -nowarn -d target\classes -sourcepath jvm -cp "d:\programmieren\git-java\playwall\playwallnativewin\j4n\jni4net-0.8.8.0-bin\lib\jni4net.j-0.8.8.0.jar"; "jvm\nativeaudio\LoopStream.java" "jvm\nativeaudio\NativeAudio.java" +javac -nowarn -d target\classes -sourcepath jvm -cp "d:\programmieren\git-java\playwall\playwallnativewin\j4n\jni4net.j-0.8.8.0.jar"; "jvm\nativeaudio\LoopStream.java" "jvm\nativeaudio\NativeAudio.java" IF %ERRORLEVEL% NEQ 0 goto end @@ -14,7 +14,7 @@ IF %ERRORLEVEL% NEQ 0 goto end echo NativeAudio.j4n.dll -csc /nologo /warn:0 /t:library /out:NativeAudio.j4n.dll /recurse:clr\*.cs /reference:"D:\Programmieren\Git-Java\PlayWall\PlayWallNativeWin\j4n\NativeAudio.dll" /reference:"D:\Programmieren\Git-Java\PlayWall\PlayWallNativeWin\j4n\jni4net-0.8.8.0-bin\lib\jni4net.n-0.8.8.0.dll" +csc /nologo /warn:0 /t:library /out:NativeAudio.j4n.dll /recurse:clr\*.cs /reference:"D:\Programmieren\Git-Java\PlayWall\PlayWallNativeWin\j4n\NativeAudio.dll" /reference:"D:\Programmieren\Git-Java\PlayWall\PlayWallNativeWin\j4n\jni4net.n-0.8.8.0.dll" IF %ERRORLEVEL% NEQ 0 goto end diff --git a/PlayWallNativeWin/j4n/clr/nativeaudio/NativeAudio.generated.cs b/PlayWallNativeWin/j4n/clr/nativeaudio/NativeAudio.generated.cs index a869f90ff6f4e4128af2b54161408cbcd556dfda..ea98eeed7f0c8d0a291dcdbab386ce7a7c5f7e44 100644 --- a/PlayWallNativeWin/j4n/clr/nativeaudio/NativeAudio.generated.cs +++ b/PlayWallNativeWin/j4n/clr/nativeaudio/NativeAudio.generated.cs @@ -49,7 +49,9 @@ namespace NativeAudio { methods.Add(global::net.sf.jni4net.jni.JNINativeMethod.Create(@__type, "isPlaying", "isPlaying6", "()Z")); methods.Add(global::net.sf.jni4net.jni.JNINativeMethod.Create(@__type, "setVolume", "setVolume7", "(F)V")); methods.Add(global::net.sf.jni4net.jni.JNINativeMethod.Create(@__type, "setLoop", "setLoop8", "(Z)V")); - methods.Add(global::net.sf.jni4net.jni.JNINativeMethod.Create(@__type, "unload", "unload9", "()V")); + methods.Add(global::net.sf.jni4net.jni.JNINativeMethod.Create(@__type, "setDevice", "setDevice9", "(Ljava/lang/String;)V")); + methods.Add(global::net.sf.jni4net.jni.JNINativeMethod.Create(@__type, "getDevices", "getDevices10", "()[Ljava/lang/String;")); + methods.Add(global::net.sf.jni4net.jni.JNINativeMethod.Create(@__type, "unload", "unload11", "()V")); methods.Add(global::net.sf.jni4net.jni.JNINativeMethod.Create(@__type, "__ctorNativeAudio0", "__ctorNativeAudio0", "(Lnet/sf/jni4net/inj/IClrProxy;)V")); return methods; } @@ -152,7 +154,28 @@ namespace NativeAudio { }catch (global::System.Exception __ex){@__env.ThrowExisting(__ex);} } - private static void unload9(global::System.IntPtr @__envp, global::net.sf.jni4net.utils.JniLocalHandle @__obj) { + private static void setDevice9(global::System.IntPtr @__envp, global::net.sf.jni4net.utils.JniLocalHandle @__obj, global::net.sf.jni4net.utils.JniLocalHandle name) { + // (Ljava/lang/String;)V + // (LSystem/String;)V + global::net.sf.jni4net.jni.JNIEnv @__env = global::net.sf.jni4net.jni.JNIEnv.Wrap(@__envp); + try { + global::NativeAudio.NativeAudio @__real = global::net.sf.jni4net.utils.Convertor.StrongJp2C<global::NativeAudio.NativeAudio>(@__env, @__obj); + @__real.setDevice(global::net.sf.jni4net.utils.Convertor.StrongJ2CString(@__env, name)); + }catch (global::System.Exception __ex){@__env.ThrowExisting(__ex);} + } + + private static global::net.sf.jni4net.utils.JniHandle getDevices10(global::System.IntPtr @__envp, global::net.sf.jni4net.utils.JniLocalHandle @__class) { + // ()[Ljava/lang/String; + // ()[LSystem/String; + global::net.sf.jni4net.jni.JNIEnv @__env = global::net.sf.jni4net.jni.JNIEnv.Wrap(@__envp); + global::net.sf.jni4net.utils.JniHandle @__return = default(global::net.sf.jni4net.utils.JniHandle); + try { + @__return = global::net.sf.jni4net.utils.Convertor.ArrayStrongC2JString(@__env, global::NativeAudio.NativeAudio.getDevices()); + }catch (global::System.Exception __ex){@__env.ThrowExisting(__ex);} + return @__return; + } + + private static void unload11(global::System.IntPtr @__envp, global::net.sf.jni4net.utils.JniLocalHandle @__obj) { // ()V // ()V global::net.sf.jni4net.jni.JNIEnv @__env = global::net.sf.jni4net.jni.JNIEnv.Wrap(@__envp); diff --git a/PlayWallNativeWin/j4n/jvm/nativeaudio/NativeAudio.java b/PlayWallNativeWin/j4n/jvm/nativeaudio/NativeAudio.java index f8a496f024e50f15f69ef3bdaf9752351e56d735..ffd1aef71ce846ebd29eabbde1dccc280081003f 100644 --- a/PlayWallNativeWin/j4n/jvm/nativeaudio/NativeAudio.java +++ b/PlayWallNativeWin/j4n/jvm/nativeaudio/NativeAudio.java @@ -55,6 +55,12 @@ public class NativeAudio extends system.Object { @net.sf.jni4net.attributes.ClrMethod("(Z)V") public native void setLoop(boolean loop); + @net.sf.jni4net.attributes.ClrMethod("(LSystem/String;)V") + public native void setDevice(java.lang.String name); + + @net.sf.jni4net.attributes.ClrMethod("()[LSystem/String;") + public native static java.lang.String[] getDevices(); + @net.sf.jni4net.attributes.ClrMethod("()V") public native void unload(); diff --git a/PlayWallNativeWin/j4n/target/classes/nativeaudio/NativeAudio.class b/PlayWallNativeWin/j4n/target/classes/nativeaudio/NativeAudio.class index e81585d278c3c21c56c80de6ccd3c9db5118c09d..95dcb66bfa41ce732ba8934419c2def276b6ae7a 100644 Binary files a/PlayWallNativeWin/j4n/target/classes/nativeaudio/NativeAudio.class and b/PlayWallNativeWin/j4n/target/classes/nativeaudio/NativeAudio.class differ