OSDN Git Service

[removed] Sound#stop(). To support this the desktop would have to keep track of the...
authornathan.sweet <nathan.sweet@6c4fd544-2939-11df-bb46-9574ba5d0bfa>
Wed, 9 Mar 2011 21:19:49 +0000 (21:19 +0000)
committernathan.sweet <nathan.sweet@6c4fd544-2939-11df-bb46-9574ba5d0bfa>
Wed, 9 Mar 2011 21:19:49 +0000 (21:19 +0000)
[fixed] OpenALSound#dispose().

backends/gdx-openal/src/com/badlogic/gdx/backends/openal/OpenALSound.java
gdx/src/com/badlogic/gdx/audio/Sound.java

index f90fee5..90471e2 100644 (file)
@@ -28,7 +28,6 @@ import static org.lwjgl.openal.AL10.*;
 public class OpenALSound implements Sound {\r
        private int bufferID = -1;\r
        private final OpenALAudio audio;\r
-       private int streamID;\r
 \r
        public OpenALSound (OpenALAudio audio) {\r
                this.audio = audio;\r
@@ -52,7 +51,7 @@ public class OpenALSound implements Sound {
        }\r
 \r
        public void play (float volume) {\r
-               streamID = audio.obtainStream(false);\r
+               int streamID = audio.obtainStream(false);\r
                if (streamID == -1) return;\r
                alSourceStop(streamID);\r
                alSourcei(streamID, AL_BUFFER, 0);\r
@@ -63,7 +62,7 @@ public class OpenALSound implements Sound {
        }\r
 \r
        public void loop () {\r
-               streamID = audio.obtainStream(false);\r
+               int streamID = audio.obtainStream(false);\r
                if (streamID == -1) return;\r
                alSourceStop(streamID);\r
                alSourcei(streamID, AL_BUFFER, 0);\r
@@ -72,20 +71,8 @@ public class OpenALSound implements Sound {
                alSourcePlay(streamID);\r
        }\r
 \r
-       public void stop () {\r
-               if (streamID == -1) return;\r
-               alSourceStop(streamID);\r
-               alSourcei(streamID, AL_BUFFER, 0);\r
-               streamID = -1;\r
-       }\r
-\r
        public void dispose () {\r
                if (bufferID == -1) return;\r
-               if (streamID != -1) {\r
-                       alSourceStop(streamID);\r
-                       alSourcei(streamID, AL_BUFFER, 0);\r
-                       streamID = -1;\r
-               }\r
                alDeleteBuffers(bufferID);\r
                bufferID = -1;\r
        }\r
index 04f9ebc..7db3ecb 100644 (file)
@@ -43,11 +43,6 @@ public interface Sound extends Disposable {
        public void play (float volume);\r
 \r
        /**\r
-        * Stops the sound.\r
-        */\r
-       public void stop ();\r
-\r
-       /**\r
         * Releases all the resources.\r
         */\r
        public void dispose ();\r