OSDN Git Service

[changed] MAKE EVERYTHING PUBLIC!
authorbadlogicgames <badlogicgames@6c4fd544-2939-11df-bb46-9574ba5d0bfa>
Sun, 23 Oct 2011 05:15:20 +0000 (05:15 +0000)
committerbadlogicgames <badlogicgames@6c4fd544-2939-11df-bb46-9574ba5d0bfa>
Sun, 23 Oct 2011 05:15:20 +0000 (05:15 +0000)
13 files changed:
backends/gdx-openal/src/com/badlogic/gdx/backends/openal/JavaSoundAudioDevice.java
backends/gdx-openal/src/com/badlogic/gdx/backends/openal/Mp3.java
backends/gdx-openal/src/com/badlogic/gdx/backends/openal/Ogg.java
backends/gdx-openal/src/com/badlogic/gdx/backends/openal/OpenALMusic.java
backends/gdx-openal/src/com/badlogic/gdx/backends/openal/Wav.java
demos/metagun/metagun-android/libs/armeabi-v7a/libandroidgl20.so [new file with mode: 0644]
demos/metagun/metagun-android/libs/armeabi-v7a/libgdx.so [new file with mode: 0644]
demos/metagun/metagun-android/libs/armeabi/libandroidgl20.so [new file with mode: 0644]
demos/metagun/metagun-android/libs/armeabi/libgdx.so [new file with mode: 0644]
demos/very-angry-robots/very-angry-robots-android/libs/armeabi-v7a/libandroidgl20.so [new file with mode: 0644]
demos/very-angry-robots/very-angry-robots-android/libs/armeabi-v7a/libgdx.so [new file with mode: 0644]
demos/very-angry-robots/very-angry-robots-android/libs/armeabi/libandroidgl20.so [new file with mode: 0644]
demos/very-angry-robots/very-angry-robots-android/libs/armeabi/libgdx.so [new file with mode: 0644]

index ab3c957..f580fef 100644 (file)
@@ -35,7 +35,7 @@ public class JavaSoundAudioDevice implements AudioDevice {
                try {\r
                        AudioFormat format = new AudioFormat(samplingRate, 16, isMono ? 1 : 2, true, false);\r
                        line = AudioSystem.getSourceDataLine(format);\r
-                       line.open(format, Math.min(2048, samplingRate / 5) * 2);\r
+                       line.open(format, 2048 * 10);// Math.min(2048*10, samplingRate / 5) * 2);\r
                        line.start();\r
                } catch (Exception ex) {\r
                        throw new GdxRuntimeException("Error creating JavaSoundAudioDevice.", ex);\r
index 40aaf00..72a50ad 100644 (file)
@@ -52,7 +52,7 @@ public class Mp3 {
                        }\r
                }\r
 \r
-               protected int read (byte[] buffer) {\r
+               public int read (byte[] buffer) {\r
                        try {\r
                                boolean setup = bitstream == null;\r
                                if (setup) {\r
@@ -90,7 +90,7 @@ public class Mp3 {
                        }\r
                }\r
 \r
-               protected void reset () {\r
+               public void reset () {\r
                        if (bitstream == null) return;\r
                        try {\r
                                bitstream.close();\r
index fca4619..894ceb4 100644 (file)
@@ -31,7 +31,7 @@ public class Ogg {
                        setup(input.getChannels(), input.getSampleRate());\r
                }\r
 \r
-               protected int read (byte[] buffer) {\r
+               public int read (byte[] buffer) {\r
                        if (input == null) {\r
                                input = new OggInputStream(file.read());\r
                                setup(input.getChannels(), input.getSampleRate());\r
@@ -39,7 +39,7 @@ public class Ogg {
                        return input.read(buffer);\r
                }\r
 \r
-               protected void reset () {\r
+               public void reset () {\r
                        if (input == null) return;\r
                        input.close();\r
                        input = null;\r
index 4363359..4aa1aba 100644 (file)
@@ -50,7 +50,7 @@ public abstract class OpenALMusic implements Music {
                this.audio = audio;\r
                this.file = file;\r
 \r
-               audio.music.add(this);\r
+               if(audio != null) audio.music.add(this);\r
        }\r
 \r
        protected void setup (int channels, int sampleRate) {\r
@@ -123,10 +123,18 @@ public abstract class OpenALMusic implements Music {
 \r
        /** Fills as much of the buffer as possible and returns the number of bytes filled. Returns <= 0 to indicate the end of the\r
         * stream. */\r
-       abstract protected int read (byte[] buffer);\r
+       abstract public int read (byte[] buffer);\r
 \r
        /** Resets the stream to the beginning. */\r
-       abstract protected void reset ();\r
+       abstract public void reset ();\r
+       \r
+       public int getChannels() {\r
+               return format == AL_FORMAT_STEREO16?2:1;\r
+       }\r
+       \r
+       public int getRate() {\r
+               return sampleRate;\r
+       }\r
 \r
        public void update () {\r
                if (sourceID == -1) return;\r
index 48a617c..80a2c2f 100644 (file)
@@ -34,7 +34,7 @@ public class Wav {
                        setup(input.channels, input.sampleRate);\r
                }\r
 \r
-               protected int read (byte[] buffer) {\r
+               public int read (byte[] buffer) {\r
                        if (input == null) {\r
                                input = new WavInputStream(file);\r
                                setup(input.channels, input.sampleRate);\r
@@ -46,7 +46,7 @@ public class Wav {
                        }\r
                }\r
 \r
-               protected void reset () {\r
+               public void reset () {\r
                        if (input == null) return;\r
                        try {\r
                                input.close();\r
diff --git a/demos/metagun/metagun-android/libs/armeabi-v7a/libandroidgl20.so b/demos/metagun/metagun-android/libs/armeabi-v7a/libandroidgl20.so
new file mode 100644 (file)
index 0000000..7a7cd7f
Binary files /dev/null and b/demos/metagun/metagun-android/libs/armeabi-v7a/libandroidgl20.so differ
diff --git a/demos/metagun/metagun-android/libs/armeabi-v7a/libgdx.so b/demos/metagun/metagun-android/libs/armeabi-v7a/libgdx.so
new file mode 100644 (file)
index 0000000..c5723f4
Binary files /dev/null and b/demos/metagun/metagun-android/libs/armeabi-v7a/libgdx.so differ
diff --git a/demos/metagun/metagun-android/libs/armeabi/libandroidgl20.so b/demos/metagun/metagun-android/libs/armeabi/libandroidgl20.so
new file mode 100644 (file)
index 0000000..7a7cd7f
Binary files /dev/null and b/demos/metagun/metagun-android/libs/armeabi/libandroidgl20.so differ
diff --git a/demos/metagun/metagun-android/libs/armeabi/libgdx.so b/demos/metagun/metagun-android/libs/armeabi/libgdx.so
new file mode 100644 (file)
index 0000000..5e7426c
Binary files /dev/null and b/demos/metagun/metagun-android/libs/armeabi/libgdx.so differ
diff --git a/demos/very-angry-robots/very-angry-robots-android/libs/armeabi-v7a/libandroidgl20.so b/demos/very-angry-robots/very-angry-robots-android/libs/armeabi-v7a/libandroidgl20.so
new file mode 100644 (file)
index 0000000..7a7cd7f
Binary files /dev/null and b/demos/very-angry-robots/very-angry-robots-android/libs/armeabi-v7a/libandroidgl20.so differ
diff --git a/demos/very-angry-robots/very-angry-robots-android/libs/armeabi-v7a/libgdx.so b/demos/very-angry-robots/very-angry-robots-android/libs/armeabi-v7a/libgdx.so
new file mode 100644 (file)
index 0000000..c5723f4
Binary files /dev/null and b/demos/very-angry-robots/very-angry-robots-android/libs/armeabi-v7a/libgdx.so differ
diff --git a/demos/very-angry-robots/very-angry-robots-android/libs/armeabi/libandroidgl20.so b/demos/very-angry-robots/very-angry-robots-android/libs/armeabi/libandroidgl20.so
new file mode 100644 (file)
index 0000000..7a7cd7f
Binary files /dev/null and b/demos/very-angry-robots/very-angry-robots-android/libs/armeabi/libandroidgl20.so differ
diff --git a/demos/very-angry-robots/very-angry-robots-android/libs/armeabi/libgdx.so b/demos/very-angry-robots/very-angry-robots-android/libs/armeabi/libgdx.so
new file mode 100644 (file)
index 0000000..5e7426c
Binary files /dev/null and b/demos/very-angry-robots/very-angry-robots-android/libs/armeabi/libgdx.so differ