Changeset 21221

Timestamp:

05/23/07 15:40:57 (18 months ago)

Author:

korli

Message:

don't try to stop a non inited BFileGameSound
now stops BFileGameSound at the end of the track if not looping
GameSoundDevice now checks the sound_id is valid
added a header include in GSUtility.h

Location:

haiku/trunk/src/kits/game

Files:

• FileGameSound.cpp (modified) (5 diffs)
• GSUtility.h (modified) (1 diff)
• GameSoundDevice.cpp (modified) (5 diffs)

haiku/trunk/src/kits/game/FileGameSound.cpp

@@ -199 +199 @@
         status_t error = BStreamingGameSound::StopPlaying();
         
+        if (!fAudioStream || !fAudioStream->stream)
+                return B_OK;
+                 
         // start reading next time from the start of the file
         int64 frame = 0;
@@ -231 +234 @@
                         Load();
                 }
-                        
+                
+                if (fPlayPosition + bytes > fBufferSize)
+                        bytes = fBufferSize - fPlayPosition;
+                        
+                if (bytes == 0)
+                        return;
+                
                 if (fPausing) {
                         Lock();
@@ -350 +359 @@
         // is this is an audio file?            
         media_format playFormat;
-        fAudioStream->stream->EncodedFormat(&playFormat);
+        if ((error = fAudioStream->stream->EncodedFormat(&playFormat)) != B_OK)
+                return error;
+        
         if (!playFormat.IsAudio()) 
                 return B_MEDIA_BAD_FORMAT;
@@ -395 +406 @@
         
         if (fPlayPosition != 0) {
-                memcpy(fBuffer, fBuffer + fPlayPosition, fBufferSize - fPlayPosition);
+                if (fBufferSize > fPlayPosition)
+                        memcpy(fBuffer, fBuffer + fPlayPosition, fBufferSize - fPlayPosition);
                 fPlayPosition = fBufferSize - fPlayPosition;
         }
@@ -404 +416 @@
         fBufferSize = fPlayPosition + frames * fFrameSize;
         fPlayPosition = 0;
+        
+        if (fBufferSize == 0) {
+                if (fLooping) {
+                        // start reading next time from the start of the file
+                        int64 frame = 0;
+                        fAudioStream->stream->SeekToFrame(&frame);
+                } else {
+                        StopPlaying();
+                }
+        }
                 
         return true;

haiku/trunk/src/kits/game/GSUtility.h

@@ -34 +34 @@
 // Project Includes ------------------------------------------------------------
 #include <GameSoundDefs.h>
+#include <MediaDefs.h>
 
 // Local Includes --------------------------------------------------------------

haiku/trunk/src/kits/game/GameSoundDevice.cpp

@@ -191 +191 @@
 BGameSoundDevice::ReleaseBuffer(gs_id sound)
 {
+        if (sound <= 0)
+                return;
+
         if (fSounds[sound-1])
         {
@@ -208 +211 @@
                                                  void * data)
 {
-        if (!format) return B_BAD_VALUE;
+        if (!format || sound <= 0)
+                return B_BAD_VALUE;
 
         memcpy(format, &fSounds[sound-1]->Format(), sizeof(gs_audio_format));
         
-        if (fSounds[sound-1]->Data())
-        {
+        if (fSounds[sound-1]->Data()) {
                 data = malloc(format->buffer_size);
                 memcpy(data, fSounds[sound-1]->Data(), format->buffer_size);
@@ -225 +228 @@
 BGameSoundDevice::StartPlaying(gs_id sound)
 {
-        status_t error = EALREADY;
-        
-        if (!fSounds[sound-1]->IsPlaying())
-        {
+        if (sound <= 0)
+                return B_BAD_VALUE;
+                
+        if (!fSounds[sound-1]->IsPlaying()) {
                 // tell the producer to start playing the sound
-                error = fSounds[sound-1]->StartPlaying();
-        }
-        else fSounds[sound-1]->Reset();
-        
-        return error;
+                return fSounds[sound-1]->StartPlaying();
+        }
+        
+        fSounds[sound-1]->Reset();
+        return EALREADY;
 }
 
@@ -241 +244 @@
 BGameSoundDevice::StopPlaying(gs_id sound)
 {
-        status_t error = EALREADY;
-        
-        if (fSounds[sound-1]->IsPlaying())
-        {
+        if (sound <= 0)
+                return B_BAD_VALUE;
+        
+        if (fSounds[sound-1]->IsPlaying()) {
                 // Tell the producer to stop play this sound
                 fSounds[sound-1]->Reset();  
-                error = fSounds[sound-1]->StopPlaying();
-        }
-        
-        return error;
+                return fSounds[sound-1]->StopPlaying();
+        }
+        
+        return EALREADY;
 }
 
@@ -257 +260 @@
 BGameSoundDevice::IsPlaying(gs_id sound)
 {
+        if (sound <= 0)
+                return false;
         return fSounds[sound-1]->IsPlaying();
 }