diff options
| author | Travis Howell | 2003-09-24 06:56:30 +0000 |
|---|---|---|
| committer | Travis Howell | 2003-09-24 06:56:30 +0000 |
| commit | 4a62eb3e3b75944bca5af3bbab9e05dfecd77dcd (patch) | |
| tree | fcd1210b4b896122ade69adf498a7054e23cd8d4 /scumm/sound.cpp | |
| parent | 09a01e4cbeada86167d83608cd0dcd77d7a0168f (diff) | |
| download | scummvm-rg350-4a62eb3e3b75944bca5af3bbab9e05dfecd77dcd.tar.gz scummvm-rg350-4a62eb3e3b75944bca5af3bbab9e05dfecd77dcd.tar.bz2 scummvm-rg350-4a62eb3e3b75944bca5af3bbab9e05dfecd77dcd.zip | |
More Amiga V2/V3 sound updates from _Q_:
1. A Player_MOD class, basically acts as a simplified mixer that mixes at 60Hz intervals (or whatever interval you specify), this gives smooth music playback in player_v3a
2. Some changes to player_v3a as a result of #1, including reduced music volume
3. player_v2a, and the necessary additions to scummvm.cpp/scumm.h
svn-id: r10392
Diffstat (limited to 'scumm/sound.cpp')
| -rw-r--r-- | scumm/sound.cpp | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/scumm/sound.cpp b/scumm/sound.cpp index ef6219e20a..df82552470 100644 --- a/scumm/sound.cpp +++ b/scumm/sound.cpp @@ -25,8 +25,6 @@ #include "bundle.h" #include "imuse.h" #include "imuse_digi.h" -#include "player_v2.h" -#include "player_v3a.h" #include "scumm.h" #include "sound.h" @@ -439,28 +437,6 @@ void Sound::playSound(int soundID) { memcpy(sound,ptr + READ_BE_UINT16(ptr + 8), size); _scumm->_mixer->playRaw(NULL, sound, size, rate, SoundMixer::FLAG_AUTOFREE, soundID, vol, 0); } - else if ((_scumm->_features & GF_AMIGA) && (_scumm->_version <= 2) && READ_BE_UINT16(ptr + 14) == 0x0880) { - size = READ_BE_UINT16(ptr + 6); - int start = READ_BE_UINT16(ptr + 8); - start += 10; - rate = 11000; - int vol = 255; - int i = 0; - - while (i < start) { - if ((READ_BE_UINT16(ptr) == 0x357c) && (READ_BE_UINT16(ptr + 4) == 6)) - rate = 3579545 / READ_BE_UINT16(ptr + 2); - - if ((READ_BE_UINT16(ptr) == 0x357c) && (READ_BE_UINT16(ptr + 4) == 8)) - vol = READ_BE_UINT16(ptr + 2) * 4; - ptr += 2; - i += 2; - } - - sound = (char *)malloc(size); - memcpy(sound, ptr, size); - _scumm->_mixer->playRaw(NULL, sound, size, rate, SoundMixer::FLAG_AUTOFREE, soundID, vol, 0); - } else { if (_scumm->_gameId == GID_MONKEY_VGA || _scumm->_gameId == GID_MONKEY_EGA) { |