From 2914d09c43d6c92745e3d672f38dac16abf1ee92 Mon Sep 17 00:00:00 2001 From: "nathan.sweet" Date: Thu, 4 Nov 2010 05:33:13 +0000 Subject: [PATCH] [fixed] Bugs with loading sound and music from classpath on desktop. --- .../com/badlogic/gdx/backends/jogl/JoglMusic.java | 6 +- .../com/badlogic/gdx/backends/jogl/JoglSound.java | 2 +- .../badlogic/gdx/backends/lwjgl/LwjglMusic.java | 6 +- .../badlogic/gdx/backends/lwjgl/LwjglSound.java | 2 +- .../twl/gdx-twl/src/com/badlogic/gdx/twl/TWL.java | 114 ++++++++++----------- 5 files changed, 65 insertions(+), 65 deletions(-) diff --git a/backends/gdx-backend-jogl/src/com/badlogic/gdx/backends/jogl/JoglMusic.java b/backends/gdx-backend-jogl/src/com/badlogic/gdx/backends/jogl/JoglMusic.java index fbcd93267..53f8a024a 100644 --- a/backends/gdx-backend-jogl/src/com/badlogic/gdx/backends/jogl/JoglMusic.java +++ b/backends/gdx-backend-jogl/src/com/badlogic/gdx/backends/jogl/JoglMusic.java @@ -33,7 +33,7 @@ public class JoglMusic implements Music, Runnable { private State state = State.Stopped; private final Thread thread; - private final File file; + private final JoglFileHandle handle; private AudioInputStream ain; private final SourceDataLine line; private final byte[] buffer; @@ -41,7 +41,7 @@ public class JoglMusic implements Music, Runnable { private boolean disposed = false; public JoglMusic (JoglFileHandle handle) throws UnsupportedAudioFileException, IOException, LineUnavailableException { - this.file = handle.getFile(); + this.handle = handle; openAudioInputStream(); AudioFormat audioFormat = ain.getFormat(); @@ -58,7 +58,7 @@ public class JoglMusic implements Music, Runnable { } private void openAudioInputStream () throws UnsupportedAudioFileException, IOException { - ain = AudioSystem.getAudioInputStream(file); + ain = AudioSystem.getAudioInputStream(handle.readFile()); AudioFormat baseFormat = ain.getFormat(); AudioFormat decodedFormat = new AudioFormat(AudioFormat.Encoding.PCM_SIGNED, baseFormat.getSampleRate(), 16, baseFormat.getChannels(), baseFormat.getChannels() * 2, baseFormat.getSampleRate(), false); diff --git a/backends/gdx-backend-jogl/src/com/badlogic/gdx/backends/jogl/JoglSound.java b/backends/gdx-backend-jogl/src/com/badlogic/gdx/backends/jogl/JoglSound.java index 3d8d5e01d..6608aef7c 100644 --- a/backends/gdx-backend-jogl/src/com/badlogic/gdx/backends/jogl/JoglSound.java +++ b/backends/gdx-backend-jogl/src/com/badlogic/gdx/backends/jogl/JoglSound.java @@ -50,7 +50,7 @@ public class JoglSound implements Sound { public JoglSound (JoglAudio audio, JoglFileHandle file) throws UnsupportedAudioFileException, IOException { this.audio = audio; - InputStream fin = new BufferedInputStream(new FileInputStream(file.getFile())); + InputStream fin = new BufferedInputStream(file.readFile()); AudioInputStream ain = AudioSystem.getAudioInputStream(fin); AudioFormat baseFormat = ain.getFormat(); AudioFormat decodedFormat = new AudioFormat(AudioFormat.Encoding.PCM_SIGNED, baseFormat.getSampleRate(), 16, diff --git a/backends/gdx-backend-lwjgl/src/com/badlogic/gdx/backends/lwjgl/LwjglMusic.java b/backends/gdx-backend-lwjgl/src/com/badlogic/gdx/backends/lwjgl/LwjglMusic.java index ad921512b..624721f71 100644 --- a/backends/gdx-backend-lwjgl/src/com/badlogic/gdx/backends/lwjgl/LwjglMusic.java +++ b/backends/gdx-backend-lwjgl/src/com/badlogic/gdx/backends/lwjgl/LwjglMusic.java @@ -33,7 +33,7 @@ final class LwjglMusic implements Music, Runnable { private State state = State.Stopped; private final Thread thread; - private final File file; + private final LwjglFileHandle handle; private AudioInputStream ain; private final SourceDataLine line; private final byte[] buffer; @@ -41,7 +41,7 @@ final class LwjglMusic implements Music, Runnable { private boolean disposed = false; public LwjglMusic (LwjglFileHandle handle) throws UnsupportedAudioFileException, IOException, LineUnavailableException { - this.file = handle.getFile(); + this.handle = handle; openAudioInputStream(); AudioFormat audioFormat = ain.getFormat(); @@ -58,7 +58,7 @@ final class LwjglMusic implements Music, Runnable { } private void openAudioInputStream () throws UnsupportedAudioFileException, IOException { - ain = AudioSystem.getAudioInputStream(file); + ain = AudioSystem.getAudioInputStream(handle.readFile()); AudioFormat baseFormat = ain.getFormat(); AudioFormat decodedFormat = new AudioFormat(AudioFormat.Encoding.PCM_SIGNED, baseFormat.getSampleRate(), 16, baseFormat.getChannels(), baseFormat.getChannels() * 2, baseFormat.getSampleRate(), false); diff --git a/backends/gdx-backend-lwjgl/src/com/badlogic/gdx/backends/lwjgl/LwjglSound.java b/backends/gdx-backend-lwjgl/src/com/badlogic/gdx/backends/lwjgl/LwjglSound.java index bc572a8ee..dabfbc658 100644 --- a/backends/gdx-backend-lwjgl/src/com/badlogic/gdx/backends/lwjgl/LwjglSound.java +++ b/backends/gdx-backend-lwjgl/src/com/badlogic/gdx/backends/lwjgl/LwjglSound.java @@ -50,7 +50,7 @@ final class LwjglSound implements Sound { public LwjglSound (LwjglAudio audio, LwjglFileHandle file) throws UnsupportedAudioFileException, IOException { this.audio = audio; - InputStream fin = new BufferedInputStream(new FileInputStream(file.getFile())); + InputStream fin = new BufferedInputStream(file.readFile()); AudioInputStream ain = AudioSystem.getAudioInputStream(fin); AudioFormat baseFormat = ain.getFormat(); AudioFormat decodedFormat = new AudioFormat(AudioFormat.Encoding.PCM_SIGNED, baseFormat.getSampleRate(), 16, diff --git a/extensions/twl/gdx-twl/src/com/badlogic/gdx/twl/TWL.java b/extensions/twl/gdx-twl/src/com/badlogic/gdx/twl/TWL.java index 735d0fa1a..8b949d5fe 100644 --- a/extensions/twl/gdx-twl/src/com/badlogic/gdx/twl/TWL.java +++ b/extensions/twl/gdx-twl/src/com/badlogic/gdx/twl/TWL.java @@ -11,7 +11,7 @@ import java.net.URLStreamHandler; import com.badlogic.gdx.Files.FileType; import com.badlogic.gdx.Gdx; -import com.badlogic.gdx.Input; +import com.badlogic.gdx.Input.Keys; import com.badlogic.gdx.InputMultiplexer; import com.badlogic.gdx.InputProcessor; import com.badlogic.gdx.files.FileHandle; @@ -151,62 +151,62 @@ public class TWL implements InputProcessor { static public int getTwlKeyCode (int gdxKeyCode) { switch (gdxKeyCode) { - case Input.Keys.KEYCODE_0: return Event.KEY_0; - case Input.Keys.KEYCODE_1: return Event.KEY_1; - case Input.Keys.KEYCODE_2: return Event.KEY_2; - case Input.Keys.KEYCODE_3: return Event.KEY_3; - case Input.Keys.KEYCODE_4: return Event.KEY_4; - case Input.Keys.KEYCODE_5: return Event.KEY_5; - case Input.Keys.KEYCODE_6: return Event.KEY_6; - case Input.Keys.KEYCODE_7: return Event.KEY_7; - case Input.Keys.KEYCODE_8: return Event.KEY_8; - case Input.Keys.KEYCODE_9: return Event.KEY_9; - case Input.Keys.KEYCODE_A: return Event.KEY_A; - case Input.Keys.KEYCODE_B: return Event.KEY_B; - case Input.Keys.KEYCODE_C: return Event.KEY_C; - case Input.Keys.KEYCODE_D: return Event.KEY_D; - case Input.Keys.KEYCODE_E: return Event.KEY_E; - case Input.Keys.KEYCODE_F: return Event.KEY_F; - case Input.Keys.KEYCODE_G: return Event.KEY_G; - case Input.Keys.KEYCODE_H: return Event.KEY_H; - case Input.Keys.KEYCODE_I: return Event.KEY_I; - case Input.Keys.KEYCODE_J: return Event.KEY_J; - case Input.Keys.KEYCODE_K: return Event.KEY_K; - case Input.Keys.KEYCODE_L: return Event.KEY_L; - case Input.Keys.KEYCODE_M: return Event.KEY_M; - case Input.Keys.KEYCODE_N: return Event.KEY_N; - case Input.Keys.KEYCODE_O: return Event.KEY_O; - case Input.Keys.KEYCODE_P: return Event.KEY_P; - case Input.Keys.KEYCODE_Q: return Event.KEY_Q; - case Input.Keys.KEYCODE_R: return Event.KEY_R; - case Input.Keys.KEYCODE_S: return Event.KEY_S; - case Input.Keys.KEYCODE_T: return Event.KEY_T; - case Input.Keys.KEYCODE_U: return Event.KEY_U; - case Input.Keys.KEYCODE_V: return Event.KEY_V; - case Input.Keys.KEYCODE_W: return Event.KEY_W; - case Input.Keys.KEYCODE_X: return Event.KEY_X; - case Input.Keys.KEYCODE_Y: return Event.KEY_Y; - case Input.Keys.KEYCODE_Z: return Event.KEY_Z; - case Input.Keys.KEYCODE_ALT_LEFT: return Event.KEY_LMETA; - case Input.Keys.KEYCODE_ALT_RIGHT: return Event.KEY_RMETA; - case Input.Keys.KEYCODE_BACKSLASH: return Event.KEY_BACKSLASH; - case Input.Keys.KEYCODE_COMMA: return Event.KEY_COMMA; - case Input.Keys.KEYCODE_DEL: return Event.KEY_DELETE; - case Input.Keys.KEYCODE_DPAD_LEFT: return Event.KEY_LEFT; - case Input.Keys.KEYCODE_DPAD_RIGHT: return Event.KEY_RIGHT; - case Input.Keys.KEYCODE_DPAD_UP: return Event.KEY_UP; - case Input.Keys.KEYCODE_DPAD_DOWN: return Event.KEY_DOWN; - case Input.Keys.KEYCODE_ENTER: return Event.KEY_RETURN; - case Input.Keys.KEYCODE_HOME: return Event.KEY_HOME; - case Input.Keys.KEYCODE_MINUS: return Event.KEY_MINUS; - case Input.Keys.KEYCODE_PERIOD: return Event.KEY_PERIOD; - case Input.Keys.KEYCODE_PLUS: return Event.KEY_ADD; - case Input.Keys.KEYCODE_SEMICOLON: return Event.KEY_SEMICOLON; - case Input.Keys.KEYCODE_SHIFT_LEFT: return Event.KEY_LSHIFT; - case Input.Keys.KEYCODE_SHIFT_RIGHT: return Event.KEY_RSHIFT; - case Input.Keys.KEYCODE_SLASH: return Event.KEY_SLASH; - case Input.Keys.KEYCODE_SPACE: return Event.KEY_SPACE; - case Input.Keys.KEYCODE_TAB: return Event.KEY_TAB; + case Keys.KEYCODE_0: return Event.KEY_0; + case Keys.KEYCODE_1: return Event.KEY_1; + case Keys.KEYCODE_2: return Event.KEY_2; + case Keys.KEYCODE_3: return Event.KEY_3; + case Keys.KEYCODE_4: return Event.KEY_4; + case Keys.KEYCODE_5: return Event.KEY_5; + case Keys.KEYCODE_6: return Event.KEY_6; + case Keys.KEYCODE_7: return Event.KEY_7; + case Keys.KEYCODE_8: return Event.KEY_8; + case Keys.KEYCODE_9: return Event.KEY_9; + case Keys.KEYCODE_A: return Event.KEY_A; + case Keys.KEYCODE_B: return Event.KEY_B; + case Keys.KEYCODE_C: return Event.KEY_C; + case Keys.KEYCODE_D: return Event.KEY_D; + case Keys.KEYCODE_E: return Event.KEY_E; + case Keys.KEYCODE_F: return Event.KEY_F; + case Keys.KEYCODE_G: return Event.KEY_G; + case Keys.KEYCODE_H: return Event.KEY_H; + case Keys.KEYCODE_I: return Event.KEY_I; + case Keys.KEYCODE_J: return Event.KEY_J; + case Keys.KEYCODE_K: return Event.KEY_K; + case Keys.KEYCODE_L: return Event.KEY_L; + case Keys.KEYCODE_M: return Event.KEY_M; + case Keys.KEYCODE_N: return Event.KEY_N; + case Keys.KEYCODE_O: return Event.KEY_O; + case Keys.KEYCODE_P: return Event.KEY_P; + case Keys.KEYCODE_Q: return Event.KEY_Q; + case Keys.KEYCODE_R: return Event.KEY_R; + case Keys.KEYCODE_S: return Event.KEY_S; + case Keys.KEYCODE_T: return Event.KEY_T; + case Keys.KEYCODE_U: return Event.KEY_U; + case Keys.KEYCODE_V: return Event.KEY_V; + case Keys.KEYCODE_W: return Event.KEY_W; + case Keys.KEYCODE_X: return Event.KEY_X; + case Keys.KEYCODE_Y: return Event.KEY_Y; + case Keys.KEYCODE_Z: return Event.KEY_Z; + case Keys.KEYCODE_ALT_LEFT: return Event.KEY_LMETA; + case Keys.KEYCODE_ALT_RIGHT: return Event.KEY_RMETA; + case Keys.KEYCODE_BACKSLASH: return Event.KEY_BACKSLASH; + case Keys.KEYCODE_COMMA: return Event.KEY_COMMA; + case Keys.KEYCODE_DEL: return Event.KEY_DELETE; + case Keys.KEYCODE_DPAD_LEFT: return Event.KEY_LEFT; + case Keys.KEYCODE_DPAD_RIGHT: return Event.KEY_RIGHT; + case Keys.KEYCODE_DPAD_UP: return Event.KEY_UP; + case Keys.KEYCODE_DPAD_DOWN: return Event.KEY_DOWN; + case Keys.KEYCODE_ENTER: return Event.KEY_RETURN; + case Keys.KEYCODE_HOME: return Event.KEY_HOME; + case Keys.KEYCODE_MINUS: return Event.KEY_MINUS; + case Keys.KEYCODE_PERIOD: return Event.KEY_PERIOD; + case Keys.KEYCODE_PLUS: return Event.KEY_ADD; + case Keys.KEYCODE_SEMICOLON: return Event.KEY_SEMICOLON; + case Keys.KEYCODE_SHIFT_LEFT: return Event.KEY_LSHIFT; + case Keys.KEYCODE_SHIFT_RIGHT: return Event.KEY_RSHIFT; + case Keys.KEYCODE_SLASH: return Event.KEY_SLASH; + case Keys.KEYCODE_SPACE: return Event.KEY_SPACE; + case Keys.KEYCODE_TAB: return Event.KEY_TAB; default: return Event.KEY_NONE; } } -- 2.11.0