[fixed] Bugs with loading sound and music from classpath on desktop.

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 fbcd932..53f8a02 100644 (file)
--- 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 {
 \r
        private State state = State.Stopped;\r
        private final Thread thread;\r
-       private final File file;\r
+       private final JoglFileHandle handle;\r
        private AudioInputStream ain;\r
        private final SourceDataLine line;\r
        private final byte[] buffer;\r
@@ -41,7 +41,7 @@ public class JoglMusic implements Music, Runnable {
        private boolean disposed = false;\r
 \r
        public JoglMusic (JoglFileHandle handle) throws UnsupportedAudioFileException, IOException, LineUnavailableException {\r
-               this.file = handle.getFile();\r
+               this.handle = handle;\r
 \r
                openAudioInputStream();\r
                AudioFormat audioFormat = ain.getFormat();\r
@@ -58,7 +58,7 @@ public class JoglMusic implements Music, Runnable {
        }\r
 \r
        private void openAudioInputStream () throws UnsupportedAudioFileException, IOException {\r
-               ain = AudioSystem.getAudioInputStream(file);\r
+               ain = AudioSystem.getAudioInputStream(handle.readFile());\r
                AudioFormat baseFormat = ain.getFormat();\r
                AudioFormat decodedFormat = new AudioFormat(AudioFormat.Encoding.PCM_SIGNED, baseFormat.getSampleRate(), 16,\r
                        baseFormat.getChannels(), baseFormat.getChannels() * 2, baseFormat.getSampleRate(), false);\r

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 3d8d5e0..6608aef 100644 (file)
--- 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 {
 \r
        public JoglSound (JoglAudio audio, JoglFileHandle file) throws UnsupportedAudioFileException, IOException {\r
                this.audio = audio;\r
-               InputStream fin = new BufferedInputStream(new FileInputStream(file.getFile()));\r
+               InputStream fin = new BufferedInputStream(file.readFile());\r
                AudioInputStream ain = AudioSystem.getAudioInputStream(fin);\r
                AudioFormat baseFormat = ain.getFormat();\r
                AudioFormat decodedFormat = new AudioFormat(AudioFormat.Encoding.PCM_SIGNED, baseFormat.getSampleRate(), 16,\r

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 ad92151..624721f 100644 (file)
--- 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 {
 \r
        private State state = State.Stopped;\r
        private final Thread thread;\r
-       private final File file;\r
+       private final LwjglFileHandle handle;\r
        private AudioInputStream ain;\r
        private final SourceDataLine line;\r
        private final byte[] buffer;\r
@@ -41,7 +41,7 @@ final class LwjglMusic implements Music, Runnable {
        private boolean disposed = false;\r
 \r
        public LwjglMusic (LwjglFileHandle handle) throws UnsupportedAudioFileException, IOException, LineUnavailableException {\r
-               this.file = handle.getFile();\r
+               this.handle = handle;\r
 \r
                openAudioInputStream();\r
                AudioFormat audioFormat = ain.getFormat();\r
@@ -58,7 +58,7 @@ final class LwjglMusic implements Music, Runnable {
        }\r
 \r
        private void openAudioInputStream () throws UnsupportedAudioFileException, IOException {\r
-               ain = AudioSystem.getAudioInputStream(file);\r
+               ain = AudioSystem.getAudioInputStream(handle.readFile());\r
                AudioFormat baseFormat = ain.getFormat();\r
                AudioFormat decodedFormat = new AudioFormat(AudioFormat.Encoding.PCM_SIGNED, baseFormat.getSampleRate(), 16,\r
                        baseFormat.getChannels(), baseFormat.getChannels() * 2, baseFormat.getSampleRate(), false);\r

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 bc572a8..dabfbc6 100644 (file)
--- 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 {
 \r
        public LwjglSound (LwjglAudio audio, LwjglFileHandle file) throws UnsupportedAudioFileException, IOException {\r
                this.audio = audio;\r
-               InputStream fin = new BufferedInputStream(new FileInputStream(file.getFile()));\r
+               InputStream fin = new BufferedInputStream(file.readFile());\r
                AudioInputStream ain = AudioSystem.getAudioInputStream(fin);\r
                AudioFormat baseFormat = ain.getFormat();\r
                AudioFormat decodedFormat = new AudioFormat(AudioFormat.Encoding.PCM_SIGNED, baseFormat.getSampleRate(), 16,\r

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 735d0fa..8b949d5 100644 (file)
--- 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;
 \r
 import com.badlogic.gdx.Files.FileType;\r
 import com.badlogic.gdx.Gdx;\r
-import com.badlogic.gdx.Input;\r
+import com.badlogic.gdx.Input.Keys;\r
 import com.badlogic.gdx.InputMultiplexer;\r
 import com.badlogic.gdx.InputProcessor;\r
 import com.badlogic.gdx.files.FileHandle;\r
@@ -151,62 +151,62 @@ public class TWL implements InputProcessor {
 \r
        static public int getTwlKeyCode (int gdxKeyCode) {\r
                switch (gdxKeyCode) {\r
-               case Input.Keys.KEYCODE_0: return Event.KEY_0;\r
-               case Input.Keys.KEYCODE_1: return Event.KEY_1;\r
-               case Input.Keys.KEYCODE_2: return Event.KEY_2;\r
-               case Input.Keys.KEYCODE_3: return Event.KEY_3;\r
-               case Input.Keys.KEYCODE_4: return Event.KEY_4;\r
-               case Input.Keys.KEYCODE_5: return Event.KEY_5;\r
-               case Input.Keys.KEYCODE_6: return Event.KEY_6;\r
-               case Input.Keys.KEYCODE_7: return Event.KEY_7;\r
-               case Input.Keys.KEYCODE_8: return Event.KEY_8;\r
-               case Input.Keys.KEYCODE_9: return Event.KEY_9;\r
-               case Input.Keys.KEYCODE_A: return Event.KEY_A;\r
-               case Input.Keys.KEYCODE_B: return Event.KEY_B;\r
-               case Input.Keys.KEYCODE_C: return Event.KEY_C;\r
-               case Input.Keys.KEYCODE_D: return Event.KEY_D;\r
-               case Input.Keys.KEYCODE_E: return Event.KEY_E;\r
-               case Input.Keys.KEYCODE_F: return Event.KEY_F;\r
-               case Input.Keys.KEYCODE_G: return Event.KEY_G;\r
-               case Input.Keys.KEYCODE_H: return Event.KEY_H;\r
-               case Input.Keys.KEYCODE_I: return Event.KEY_I;\r
-               case Input.Keys.KEYCODE_J: return Event.KEY_J;\r
-               case Input.Keys.KEYCODE_K: return Event.KEY_K;\r
-               case Input.Keys.KEYCODE_L: return Event.KEY_L;\r
-               case Input.Keys.KEYCODE_M: return Event.KEY_M;\r
-               case Input.Keys.KEYCODE_N: return Event.KEY_N;\r
-               case Input.Keys.KEYCODE_O: return Event.KEY_O;\r
-               case Input.Keys.KEYCODE_P: return Event.KEY_P;\r
-               case Input.Keys.KEYCODE_Q: return Event.KEY_Q;\r
-               case Input.Keys.KEYCODE_R: return Event.KEY_R;\r
-               case Input.Keys.KEYCODE_S: return Event.KEY_S;\r
-               case Input.Keys.KEYCODE_T: return Event.KEY_T;\r
-               case Input.Keys.KEYCODE_U: return Event.KEY_U;\r
-               case Input.Keys.KEYCODE_V: return Event.KEY_V;\r
-               case Input.Keys.KEYCODE_W: return Event.KEY_W;\r
-               case Input.Keys.KEYCODE_X: return Event.KEY_X;\r
-               case Input.Keys.KEYCODE_Y: return Event.KEY_Y;\r
-               case Input.Keys.KEYCODE_Z: return Event.KEY_Z;\r
-               case Input.Keys.KEYCODE_ALT_LEFT: return Event.KEY_LMETA;\r
-               case Input.Keys.KEYCODE_ALT_RIGHT: return Event.KEY_RMETA;\r
-               case Input.Keys.KEYCODE_BACKSLASH: return Event.KEY_BACKSLASH;\r
-               case Input.Keys.KEYCODE_COMMA: return Event.KEY_COMMA;\r
-               case Input.Keys.KEYCODE_DEL: return Event.KEY_DELETE;\r
-               case Input.Keys.KEYCODE_DPAD_LEFT: return Event.KEY_LEFT;\r
-               case Input.Keys.KEYCODE_DPAD_RIGHT: return Event.KEY_RIGHT;\r
-               case Input.Keys.KEYCODE_DPAD_UP: return Event.KEY_UP;\r
-               case Input.Keys.KEYCODE_DPAD_DOWN: return Event.KEY_DOWN;\r
-               case Input.Keys.KEYCODE_ENTER: return Event.KEY_RETURN;\r
-               case Input.Keys.KEYCODE_HOME: return Event.KEY_HOME;\r
-               case Input.Keys.KEYCODE_MINUS: return Event.KEY_MINUS;\r
-               case Input.Keys.KEYCODE_PERIOD: return Event.KEY_PERIOD;\r
-               case Input.Keys.KEYCODE_PLUS: return Event.KEY_ADD;\r
-               case Input.Keys.KEYCODE_SEMICOLON: return Event.KEY_SEMICOLON;\r
-               case Input.Keys.KEYCODE_SHIFT_LEFT: return Event.KEY_LSHIFT;\r
-               case Input.Keys.KEYCODE_SHIFT_RIGHT: return Event.KEY_RSHIFT;\r
-               case Input.Keys.KEYCODE_SLASH: return Event.KEY_SLASH;\r
-               case Input.Keys.KEYCODE_SPACE: return Event.KEY_SPACE;\r
-               case Input.Keys.KEYCODE_TAB: return Event.KEY_TAB;\r
+               case Keys.KEYCODE_0: return Event.KEY_0;\r
+               case Keys.KEYCODE_1: return Event.KEY_1;\r
+               case Keys.KEYCODE_2: return Event.KEY_2;\r
+               case Keys.KEYCODE_3: return Event.KEY_3;\r
+               case Keys.KEYCODE_4: return Event.KEY_4;\r
+               case Keys.KEYCODE_5: return Event.KEY_5;\r
+               case Keys.KEYCODE_6: return Event.KEY_6;\r
+               case Keys.KEYCODE_7: return Event.KEY_7;\r
+               case Keys.KEYCODE_8: return Event.KEY_8;\r
+               case Keys.KEYCODE_9: return Event.KEY_9;\r
+               case Keys.KEYCODE_A: return Event.KEY_A;\r
+               case Keys.KEYCODE_B: return Event.KEY_B;\r
+               case Keys.KEYCODE_C: return Event.KEY_C;\r
+               case Keys.KEYCODE_D: return Event.KEY_D;\r
+               case Keys.KEYCODE_E: return Event.KEY_E;\r
+               case Keys.KEYCODE_F: return Event.KEY_F;\r
+               case Keys.KEYCODE_G: return Event.KEY_G;\r
+               case Keys.KEYCODE_H: return Event.KEY_H;\r
+               case Keys.KEYCODE_I: return Event.KEY_I;\r
+               case Keys.KEYCODE_J: return Event.KEY_J;\r
+               case Keys.KEYCODE_K: return Event.KEY_K;\r
+               case Keys.KEYCODE_L: return Event.KEY_L;\r
+               case Keys.KEYCODE_M: return Event.KEY_M;\r
+               case Keys.KEYCODE_N: return Event.KEY_N;\r
+               case Keys.KEYCODE_O: return Event.KEY_O;\r
+               case Keys.KEYCODE_P: return Event.KEY_P;\r
+               case Keys.KEYCODE_Q: return Event.KEY_Q;\r
+               case Keys.KEYCODE_R: return Event.KEY_R;\r
+               case Keys.KEYCODE_S: return Event.KEY_S;\r
+               case Keys.KEYCODE_T: return Event.KEY_T;\r
+               case Keys.KEYCODE_U: return Event.KEY_U;\r
+               case Keys.KEYCODE_V: return Event.KEY_V;\r
+               case Keys.KEYCODE_W: return Event.KEY_W;\r
+               case Keys.KEYCODE_X: return Event.KEY_X;\r
+               case Keys.KEYCODE_Y: return Event.KEY_Y;\r
+               case Keys.KEYCODE_Z: return Event.KEY_Z;\r
+               case Keys.KEYCODE_ALT_LEFT: return Event.KEY_LMETA;\r
+               case Keys.KEYCODE_ALT_RIGHT: return Event.KEY_RMETA;\r
+               case Keys.KEYCODE_BACKSLASH: return Event.KEY_BACKSLASH;\r
+               case Keys.KEYCODE_COMMA: return Event.KEY_COMMA;\r
+               case Keys.KEYCODE_DEL: return Event.KEY_DELETE;\r
+               case Keys.KEYCODE_DPAD_LEFT: return Event.KEY_LEFT;\r
+               case Keys.KEYCODE_DPAD_RIGHT: return Event.KEY_RIGHT;\r
+               case Keys.KEYCODE_DPAD_UP: return Event.KEY_UP;\r
+               case Keys.KEYCODE_DPAD_DOWN: return Event.KEY_DOWN;\r
+               case Keys.KEYCODE_ENTER: return Event.KEY_RETURN;\r
+               case Keys.KEYCODE_HOME: return Event.KEY_HOME;\r
+               case Keys.KEYCODE_MINUS: return Event.KEY_MINUS;\r
+               case Keys.KEYCODE_PERIOD: return Event.KEY_PERIOD;\r
+               case Keys.KEYCODE_PLUS: return Event.KEY_ADD;\r
+               case Keys.KEYCODE_SEMICOLON: return Event.KEY_SEMICOLON;\r
+               case Keys.KEYCODE_SHIFT_LEFT: return Event.KEY_LSHIFT;\r
+               case Keys.KEYCODE_SHIFT_RIGHT: return Event.KEY_RSHIFT;\r
+               case Keys.KEYCODE_SLASH: return Event.KEY_SLASH;\r
+               case Keys.KEYCODE_SPACE: return Event.KEY_SPACE;\r
+               case Keys.KEYCODE_TAB: return Event.KEY_TAB;\r
                default: return Event.KEY_NONE;\r
                }\r
        }\r