Ticket #9031: scummvm-engine-tinsel.patch

sound.cpp

@@ -41 +41 @@
 #include "sound/mixer.h"
 #include "sound/adpcm.h"
 #include "sound/vag.h"
+#include "sound/flac.h"
+#include "sound/mp3.h"
+#include "sound/vorbis.h"
 
 #include "gui/message.h"
 
@@ -52 +55 @@
 
 SoundManager::SoundManager(TinselEngine *vm) :
         //_vm(vm),      // TODO: Enable this once global _vm var is gone
-        _sampleIndex(0), _sampleIndexLen(0) {
+        _sampleIndex(0), _sampleIndexLen(0),
+        _soundMode(kVOCMode)
+        {
 
         for (int i = 0; i < kNumChannels; i++)
                 _channels[i].sampleNum = _channels[i].subSample = -1;
@@ -68 +73 @@
  * @param type                  type of sound (voice or sfx)
  * @param handle                sound handle
  */
+// playSample for DiscWorld 1
 bool SoundManager::playSample(int id, Audio::Mixer::SoundType type, Audio::SoundHandle *handle) {
         // Floppy version has no sample file
         if (_vm->getFeatures() & GF_FLOPPY)
@@ -114 +120 @@
                 _vm->_mixer->playInputStream(type, &curChan.handle, vagStream);
         } else {
                 // allocate a buffer
-                void *sampleBuf = malloc(sampleLen);
+                byte *sampleBuf = (byte *)malloc(sampleLen);
                 assert(sampleBuf);
 
                 // read all of the sample
@@ -126 +132 @@
                 //_vm->_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, soundVolumeMusic);
                 _vm->_mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, volVoice);
 
+                Common::MemoryReadStream *_compressedStream =
+                        new Common::MemoryReadStream(sampleBuf, sampleLen, true);
+                Audio::AudioStream *_sampleStream = NULL;
 
                 // play it
-                _vm->_mixer->playRaw(type, &curChan.handle, sampleBuf, sampleLen, 22050,
-                                                        Audio::Mixer::FLAG_AUTOFREE | Audio::Mixer::FLAG_UNSIGNED);
+                switch (_soundMode) {
+                case kMP3Mode:
+                        #ifdef USE_MAD
+                        _sampleStream = Audio::makeMP3Stream(_compressedStream, true);
+                        #endif
+                        break;
+                case kVorbisMode:
+                        #ifdef USE_VORBIS
+                        _sampleStream = Audio::makeVorbisStream(_compressedStream, true);
+                        #endif
+                        break;
+                case kFlacMode:
+                        #ifdef USE_FLAC
+                        _sampleStream = Audio::makeFlacStream(_compressedStream, true);
+                        #endif
+                        break;
+                default:
+                        _vm->_mixer->playRaw(type, &curChan.handle, sampleBuf, sampleLen, 22050,
+                                Audio::Mixer::FLAG_AUTOFREE | Audio::Mixer::FLAG_UNSIGNED);
+                        break;
+                }
+                if (_sampleStream) {
+                        _vm->_mixer->playInputStream(type, &curChan.handle, _sampleStream);
+                }
         }
 
         if (handle)
@@ -138 +169 @@
         return true;
 }
 
+// playSample for DiscWorld 2
 bool SoundManager::playSample(int id, int sub, bool bLooped, int x, int y, int priority,
                 Audio::Mixer::SoundType type, Audio::SoundHandle *handle) {
 
@@ -251 +283 @@
         if (_sampleStream.read(sampleBuf, sampleLen) != sampleLen)
                 error(FILE_IS_CORRUPT, _vm->getSampleFile(sampleLanguage));
 
-        Common::MemoryReadStream *sampleStream =
+        Common::MemoryReadStream *_compressedStream =
                 new Common::MemoryReadStream(sampleBuf, sampleLen, true);
-        Audio::AudioStream *_stream =
-                makeADPCMStream(sampleStream, true, sampleLen, Audio::kADPCMTinsel6, 22050, 1, 24);
+        Audio::AudioStream *_sampleStream = NULL;
+
+        switch (_soundMode) {
+        case kMP3Mode:
+                #ifdef USE_MAD
+                _sampleStream = Audio::makeMP3Stream(_compressedStream, true);
+                #endif
+                break;
+        case kVorbisMode:
+                #ifdef USE_VORBIS
+                _sampleStream = Audio::makeVorbisStream(_compressedStream, true);
+                #endif
+                break;
+        case kFlacMode:
+                #ifdef USE_FLAC
+                _sampleStream = Audio::makeFlacStream(_compressedStream, true);
+                #endif
+                break;
+        default:
+                _sampleStream = Audio::makeADPCMStream(_compressedStream, true, sampleLen, Audio::kADPCMTinsel6, 22050, 1, 24);
+                break;
+        }
 
         // FIXME: Should set this in a different place ;)
         _vm->_mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, volSound);
@@ -269 +321 @@
         curChan->priority = priority;
         curChan->lastStart = g_system->getMillis();
         //                         /---Compression----\    Milis   BytesPerSecond
-        curChan->timeDuration = (((sampleLen * 64) / 25) * 1000) / (22050 * 2);
+        // not needed and won't work when using MP3/OGG/FLAC anyway
+        //curChan->timeDuration = (((sampleLen * 64) / 25) * 1000) / (22050 * 2);
 
         // Play it
-        _vm->_mixer->playInputStream(type, &curChan->handle, _stream);
+        _vm->_mixer->playInputStream(type, &curChan->handle, _sampleStream);
+
         _vm->_mixer->setChannelVolume(curChan->handle, sndVol);
         _vm->_mixer->setChannelBalance(curChan->handle, getPan(x));
 
@@ -455 +509 @@
 
                 // convert file size to size in DWORDs
                 _sampleIndexLen /= sizeof(uint32);
+
+                // Detect format of soundfile by looking at 1st sample-index
+                switch (_sampleIndex[0]) {
+                case MKID_BE('MP3 '): _soundMode = kMP3Mode; debugC(DEBUG_DETAILED, kTinselDebugSound, "Detected MP3 sound-data"); break;
+                case MKID_BE('OGG '): _soundMode = kVorbisMode; debugC(DEBUG_DETAILED, kTinselDebugSound, "Detected OGG sound-data"); break;
+                case MKID_BE('FLAC'): _soundMode = kFlacMode; debugC(DEBUG_DETAILED, kTinselDebugSound, "Detected FLAC sound-data"); break;
+                default: debugC(DEBUG_DETAILED, kTinselDebugSound, "Detected original sound-data"); break;
+                }
+                // Normally the 1st sample-index points to nothing at all
+                _sampleIndex[0] = 0;
         } else {
                 char buf[50];
                 sprintf(buf, CANNOT_FIND_FILE, _vm->getSampleIndex(sampleLanguage));

sound.h

@@ -58 +58 @@
         };
         static const int kNumChannels = kChannelSFX + kNumSFX;
 
+    enum SoundMode {
+                kVOCMode,
+                kMP3Mode,
+                kVorbisMode,
+                kFlacMode
+        };
+
         struct Channel {
                 // Sample handle
                 Audio::SoundHandle handle;
@@ -86 +93 @@
 
         /** Number of entries in the sample index */
         long _sampleIndexLen;
+
+        /** Specifies if the sample-data is compressed and if yes, how */
+        SoundMode _soundMode;
 
         /** file stream for sample file */
         TinselFile _sampleStream;