Ticket #2688: samplerate.diff

engines/sky/sound.h

@@ -83 +83 @@
         Disk *_skyDisk;
         uint16 _sfxBaseOfs;
         uint8 *_soundData;
-        uint8 *_sfxInfo;
+        uint8 *_sampleRates, *_sfxInfo;
         uint8 _mainSfxVolume;
 
         static uint16 _speechConvertTable[8];

engines/sky/sound.cpp

@@ -1070 +1070 @@
                         error("Unknown sounddriver version!");
 
         _soundsTotal = _soundData[asmOfs + 1];
+        uint16 sRateTabOfs = READ_LE_UINT16(_soundData + asmOfs + 0x29);
         _sfxBaseOfs = READ_LE_UINT16(_soundData + asmOfs + 0x31);
+        _sampleRates = _soundData + sRateTabOfs;
 
         _sfxInfo = _soundData + _sfxBaseOfs;
         // if we just restored a savegame, the sfxqueue holds the sound we need to restart
@@ -1100 +1102 @@
         sound &= 0xFF;
 
         // note: all those tables are big endian. Don't ask me why. *sigh*
+        uint16 sampleRate = READ_BE_UINT16(_sampleRates + (sound << 2));
+        if (sampleRate > 11025)
+                sampleRate = 11025;
         uint32 dataOfs  = READ_BE_UINT16(_sfxInfo + (sound << 3) + 0) << 4;
         uint32 dataSize = READ_BE_UINT16(_sfxInfo + (sound << 3) + 2);
         uint32 dataLoop = READ_BE_UINT16(_sfxInfo + (sound << 3) + 6);
@@ -1115 +1120 @@
         }
 
         if (channel == 0)
-                _mixer->playRaw(&_ingameSound0, _soundData + dataOfs, dataSize, 11025, flags, SOUND_CH0, volume, 0, loopSta, loopEnd);
+                _mixer->playRaw(&_ingameSound0, _soundData + dataOfs, dataSize, sampleRate, flags, SOUND_CH0, volume, 0, loopSta, loopEnd);
         else
-                _mixer->playRaw(&_ingameSound1, _soundData + dataOfs, dataSize, 11025, flags, SOUND_CH1, volume, 0, loopSta, loopEnd);
+                _mixer->playRaw(&_ingameSound1, _soundData + dataOfs, dataSize, sampleRate, flags, SOUND_CH1, volume, 0, loopSta, loopEnd);
 }
 
 void Sound::fnStartFx(uint32 sound, uint8 channel) {