Ticket #7994: scummvm-mixer.patch

sound/mixer.cpp

@@ -68 +68 @@
         return index;
 }
 
-int SoundMixer::insert(PlayingSoundHandle *handle, Channel * chan)
+int SoundMixer::play_raw(PlayingSoundHandle *handle, void *sound, uint32 size, uint rate,
+                                                                                                 byte flags)
 {
         for (int i = 0; i != NUM_CHANNELS; i++) {
                 if (_channels[i] == NULL) {
-                        return insert_at(handle, i, chan);
+                        return insert_at(handle, i, new Channel_RAW(this, sound, size, rate, flags));
                 }
         }
 
-        warning("SoundMixer::insert out of mixer slots");
-        chan->real_destroy();
-
+        warning("SoundMixer::out of mixer slots");
         return -1;
 }
 
-
-int SoundMixer::play_raw(PlayingSoundHandle *handle, void *sound, uint32 size, uint rate,
-                                                                                                 byte flags)
-{
-        return insert(handle, new Channel_RAW(this, sound, size, rate, flags));
-}
-
 int SoundMixer::play_stream(PlayingSoundHandle *handle, int idx, void *sound, uint32 size,
                                                                                                                 uint rate, byte flags)
 {
@@ -98 +90 @@
 #ifdef COMPRESSED_SOUND_FILE
 int SoundMixer::play_mp3(PlayingSoundHandle *handle, void *sound, uint32 size, byte flags)
 {
-        return insert(handle, new Channel_MP3(this, sound, size, flags));
+        for (int i = 0; i != NUM_CHANNELS; i++) {
+                if (_channels[i] == NULL) {
+                        return insert_at(handle, i, new Channel_MP3(this, sound, size, flags));
+                }
+        }
+
+        warning("SoundMixer::out of mixer slots");
+        return -1;
 }
 int SoundMixer::play_mp3_cdtrack(PlayingSoundHandle *handle, FILE * file, mad_timer_t duration)
 {
         /* Stop the previously playing CD track (if any) */
-        return insert(handle, new Channel_MP3_CDMUSIC(this, file, duration));
+        for (int i = 0; i != NUM_CHANNELS; i++) {
+                if (_channels[i] == NULL) {
+                        return insert_at(handle, i, new Channel_MP3_CDMUSIC(this, file, duration));
+                }
+        }
+
+        warning("SoundMixer::out of mixer slots");
+        return -1;
 }
 #endif
 

sound/mixer.h

@@ -145 +145 @@
         Channel *_channels[NUM_CHANNELS];
         PlayingSoundHandle *_handles[NUM_CHANNELS];
 
-        int insert(PlayingSoundHandle *handle, Channel * chan);
         int insert_at(PlayingSoundHandle *handle, int index, Channel * chan);
         void append(void *data, uint32 len);
         void uninsert(Channel * chan);