From 9960eeb79516d7b476f0eb4dba20be6281ec51c5 Mon Sep 17 00:00:00 2001 From: tobias <thinkdifferent055@gmail.com> Date: Sat, 6 Jul 2019 21:09:47 +0200 Subject: [PATCH] Reformat code --- .../playpad/viewcontroller/LaunchDialog.java | 2 +- .../j4n/jvm/nativeaudio/LoopStream.java | 62 ++++----- .../j4n/jvm/nativeaudio/NativeAudio.java | 122 +++++++++--------- .../mac/NativeAudioMacHandlerFactory.java | 2 +- 4 files changed, 94 insertions(+), 94 deletions(-) diff --git a/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/LaunchDialog.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/LaunchDialog.java index f896a483..de321b07 100644 --- a/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/LaunchDialog.java +++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/LaunchDialog.java @@ -137,7 +137,7 @@ public class LaunchDialog extends NVC implements ChangeListener<ConnectionState> @Override public void initStage(Stage stage) { PlayPadPlugin.styleable().applyStyleSheet(stage); - + stage.setTitle(getString(Strings.UI_Dialog_Launch_Title)); PlayPadMain.stageIcon.ifPresent(stage.getIcons()::add); diff --git a/PlayWallPluginNativeAudio/j4n/jvm/nativeaudio/LoopStream.java b/PlayWallPluginNativeAudio/j4n/jvm/nativeaudio/LoopStream.java index 3d045361..4fbc6a8b 100644 --- a/PlayWallPluginNativeAudio/j4n/jvm/nativeaudio/LoopStream.java +++ b/PlayWallPluginNativeAudio/j4n/jvm/nativeaudio/LoopStream.java @@ -11,35 +11,35 @@ package nativeaudio; @net.sf.jni4net.attributes.ClrType public class LoopStream extends system.io.Stream { - - //<generated-proxy> - private static system.Type staticType; - - protected LoopStream(net.sf.jni4net.inj.INJEnv __env, long __handle) { - super(__env, __handle); - } - - @net.sf.jni4net.attributes.ClrConstructor("(LNAudio/Wave/WaveStream;)V") - public LoopStream(system.io.Stream sourceStream) { - super(((net.sf.jni4net.inj.INJEnv)(null)), 0); - nativeaudio.LoopStream.__ctorLoopStream0(this, sourceStream); - } - - @net.sf.jni4net.attributes.ClrMethod("(Lsystem/io/Stream;)V") - private native static void __ctorLoopStream0(net.sf.jni4net.inj.IClrProxy thiz, system.io.Stream sourceStream); - - @net.sf.jni4net.attributes.ClrMethod("()Z") - public native boolean getEnableLooping(); - - @net.sf.jni4net.attributes.ClrMethod("(Z)V") - public native void setEnableLooping(boolean value); - - public static system.Type typeof() { - return nativeaudio.LoopStream.staticType; - } - - private static void InitJNI(net.sf.jni4net.inj.INJEnv env, system.Type staticType) { - nativeaudio.LoopStream.staticType = staticType; - } - //</generated-proxy> + + //<generated-proxy> + private static system.Type staticType; + + protected LoopStream(net.sf.jni4net.inj.INJEnv __env, long __handle) { + super(__env, __handle); + } + + @net.sf.jni4net.attributes.ClrConstructor("(LNAudio/Wave/WaveStream;)V") + public LoopStream(system.io.Stream sourceStream) { + super(((net.sf.jni4net.inj.INJEnv) (null)), 0); + nativeaudio.LoopStream.__ctorLoopStream0(this, sourceStream); + } + + @net.sf.jni4net.attributes.ClrMethod("(Lsystem/io/Stream;)V") + private native static void __ctorLoopStream0(net.sf.jni4net.inj.IClrProxy thiz, system.io.Stream sourceStream); + + @net.sf.jni4net.attributes.ClrMethod("()Z") + public native boolean getEnableLooping(); + + @net.sf.jni4net.attributes.ClrMethod("(Z)V") + public native void setEnableLooping(boolean value); + + public static system.Type typeof() { + return nativeaudio.LoopStream.staticType; + } + + private static void InitJNI(net.sf.jni4net.inj.INJEnv env, system.Type staticType) { + nativeaudio.LoopStream.staticType = staticType; + } + //</generated-proxy> } diff --git a/PlayWallPluginNativeAudio/j4n/jvm/nativeaudio/NativeAudio.java b/PlayWallPluginNativeAudio/j4n/jvm/nativeaudio/NativeAudio.java index f919a4fc..c11bf759 100644 --- a/PlayWallPluginNativeAudio/j4n/jvm/nativeaudio/NativeAudio.java +++ b/PlayWallPluginNativeAudio/j4n/jvm/nativeaudio/NativeAudio.java @@ -11,65 +11,65 @@ package nativeaudio; @net.sf.jni4net.attributes.ClrType public class NativeAudio extends system.Object { - - //<generated-proxy> - private static system.Type staticType; - - protected NativeAudio(net.sf.jni4net.inj.INJEnv __env, long __handle) { - super(__env, __handle); - } - - @net.sf.jni4net.attributes.ClrConstructor("()V") - public NativeAudio() { - super(((net.sf.jni4net.inj.INJEnv)(null)), 0); - nativeaudio.NativeAudio.__ctorNativeAudio0(this); - } - - @net.sf.jni4net.attributes.ClrMethod("()V") - private native static void __ctorNativeAudio0(net.sf.jni4net.inj.IClrProxy thiz); - - @net.sf.jni4net.attributes.ClrMethod("(LSystem/String;)Z") - public native boolean load(java.lang.String path); - - @net.sf.jni4net.attributes.ClrMethod("()V") - public native void play(); - - @net.sf.jni4net.attributes.ClrMethod("()V") - public native void pause(); - - @net.sf.jni4net.attributes.ClrMethod("()V") - public native void stop(); - - @net.sf.jni4net.attributes.ClrMethod("()D") - public native double getDuration(); - - @net.sf.jni4net.attributes.ClrMethod("()D") - public native double getPosition(); - - @net.sf.jni4net.attributes.ClrMethod("()Z") - public native boolean isPlaying(); - - @net.sf.jni4net.attributes.ClrMethod("(F)V") - public native void setVolume(float volume); - - @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(); - - public static system.Type typeof() { - return nativeaudio.NativeAudio.staticType; - } - - private static void InitJNI(net.sf.jni4net.inj.INJEnv env, system.Type staticType) { - nativeaudio.NativeAudio.staticType = staticType; - } - //</generated-proxy> + + //<generated-proxy> + private static system.Type staticType; + + protected NativeAudio(net.sf.jni4net.inj.INJEnv __env, long __handle) { + super(__env, __handle); + } + + @net.sf.jni4net.attributes.ClrConstructor("()V") + public NativeAudio() { + super(((net.sf.jni4net.inj.INJEnv) (null)), 0); + nativeaudio.NativeAudio.__ctorNativeAudio0(this); + } + + @net.sf.jni4net.attributes.ClrMethod("()V") + private native static void __ctorNativeAudio0(net.sf.jni4net.inj.IClrProxy thiz); + + @net.sf.jni4net.attributes.ClrMethod("(LSystem/String;)Z") + public native boolean load(java.lang.String path); + + @net.sf.jni4net.attributes.ClrMethod("()V") + public native void play(); + + @net.sf.jni4net.attributes.ClrMethod("()V") + public native void pause(); + + @net.sf.jni4net.attributes.ClrMethod("()V") + public native void stop(); + + @net.sf.jni4net.attributes.ClrMethod("()D") + public native double getDuration(); + + @net.sf.jni4net.attributes.ClrMethod("()D") + public native double getPosition(); + + @net.sf.jni4net.attributes.ClrMethod("()Z") + public native boolean isPlaying(); + + @net.sf.jni4net.attributes.ClrMethod("(F)V") + public native void setVolume(float volume); + + @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(); + + public static system.Type typeof() { + return nativeaudio.NativeAudio.staticType; + } + + private static void InitJNI(net.sf.jni4net.inj.INJEnv env, system.Type staticType) { + nativeaudio.NativeAudio.staticType = staticType; + } + //</generated-proxy> } diff --git a/PlayWallPluginNativeAudio/src/main/java/de/tobias/playpad/audio/mac/NativeAudioMacHandlerFactory.java b/PlayWallPluginNativeAudio/src/main/java/de/tobias/playpad/audio/mac/NativeAudioMacHandlerFactory.java index 45fd6cb2..045740ee 100644 --- a/PlayWallPluginNativeAudio/src/main/java/de/tobias/playpad/audio/mac/NativeAudioMacHandlerFactory.java +++ b/PlayWallPluginNativeAudio/src/main/java/de/tobias/playpad/audio/mac/NativeAudioMacHandlerFactory.java @@ -1,10 +1,10 @@ package de.tobias.playpad.audio.mac; -import de.tobias.playpad.audio.mac.AVAudioPlayerBridge.NativeAudioDelegate; import de.tobias.playpad.audio.AudioCapability; import de.tobias.playpad.audio.AudioHandler; import de.tobias.playpad.audio.AudioHandlerFactory; import de.tobias.playpad.audio.Peakable.Channel; +import de.tobias.playpad.audio.mac.AVAudioPlayerBridge.NativeAudioDelegate; import de.tobias.playpad.pad.PadStatus; import de.tobias.playpad.pad.content.PadContent; import de.tobias.playpad.viewcontroller.AudioHandlerViewController; -- GitLab