Ticket #7950: monkeymp3patch.diff

sound.cpp

@@ -24 +24 @@
 #include "scumm.h"
 #include "sound/mididrv.h"
 #include "sound/imuse.h"
+#include "sys/stat.h"
 
 #ifdef _WIN32_WCE
 extern void *bsearch(const void *, const void *, size_t,
@@ -106 +107 @@
         ptr = getResourceAddress(rtSound, sound);
         if (ptr != NULL && READ_UINT32_UNALIGNED(ptr) == MKID('SOUN')) {
                 ptr += 8;
+#ifdef COMPRESSED_SOUND_FILE
+                playMP3CDTrack(ptr[16], ptr[17] == 0xff ? -1 : ptr[17],
+                                                (ptr[18] * 60 + ptr[19]) * 75 + ptr[20], 0);
+#else
                 _system->play_cdrom(ptr[16], ptr[17] == 0xff ? -1 : ptr[17],
                                                 (ptr[18] * 60 + ptr[19]) * 75 + ptr[20], 0);
+#endif
                 current_cd_sound = sound;
                 return;
         }
@@ -691 +697 @@
         float frame_size;
         mad_timer_t duration;
 
-        if (!start && !delay) {
+        if (!num_loops && !start) {
                 _mixer->stop(_mp3_handle);
                 return;
         }
@@ -705 +711 @@
         offset = (long)((float)start / (float)75 * 1000 /
                                 (float)((float)1152 / (float)_mad_header[index].samplerate *
                                                                                   1000) * (float)(frame_size + 0.5));
         // Calc delay
-        mad_timer_set(&duration, 0, delay, 75);
+        if (!delay) {
+                struct stat file_stat;
+                fstat(fileno(_mp3_tracks[index]),&file_stat);           
+                mad_timer_set(&duration, 0,file_stat.st_size, (_mad_header[index].bitrate/8));
+        } else {
+                mad_timer_set(&duration, 0, delay, 75);
+        }       
         // Go
         fseek(_mp3_tracks[index], offset, SEEK_SET);