diff options
| author | Max Horn | 2003-09-07 16:16:19 +0000 |
|---|---|---|
| committer | Max Horn | 2003-09-07 16:16:19 +0000 |
| commit | 0012f7fa9669939dbdc4b31b5db432d08d2ce276 (patch) | |
| tree | 9d6fc2ad879c8ab33a13f2d2922f829dbd208621 /scumm/sound.cpp | |
| parent | 6a438b86a9d393c9df740ad4281a6c9c3acb5d15 (diff) | |
| download | scummvm-rg350-0012f7fa9669939dbdc4b31b5db432d08d2ce276.tar.gz scummvm-rg350-0012f7fa9669939dbdc4b31b5db432d08d2ce276.tar.bz2 scummvm-rg350-0012f7fa9669939dbdc4b31b5db432d08d2ce276.zip | |
added common base class MusicEngine for iMuse/iMuseDigital/Player_V123 (initial stab, more work to follow)
svn-id: r10066
Diffstat (limited to 'scumm/sound.cpp')
| -rw-r--r-- | scumm/sound.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/scumm/sound.cpp b/scumm/sound.cpp index e0d3323ab1..fb393f0683 100644 --- a/scumm/sound.cpp +++ b/scumm/sound.cpp @@ -182,6 +182,7 @@ void Sound::playSound(int soundID) { // FIXME: Should we replace this by an assert, and/or print an error message? return; } + if (READ_UINT32(ptr) == MKID('iMUS')){ assert(_scumm->_imuseDigital); _scumm->_imuseDigital->startSound(soundID); @@ -478,16 +479,16 @@ void Sound::playSound(int soundID) { // automatically stop the old song. if (_scumm->_imuse) { if (READ_UINT32(ptr) != MKID('ASFX')) - _scumm->_imuse->stop_all_sounds(); + _scumm->_imuse->stopAllSounds(); } } if (_scumm->_playerV2) { - _scumm->_playerV2->startSound(soundID, ptr); + _scumm->_playerV2->startSound(soundID); } if (_scumm->_playerV3A) - _scumm->_playerV3A->startSound(soundID, ptr); + _scumm->_playerV3A->startSound(soundID); if (_scumm->_imuse) { _scumm->_imuse->startSound(soundID); @@ -780,7 +781,7 @@ void Sound::stopAllSounds() { } if (_scumm->_imuse) { - _scumm->_imuse->stop_all_sounds(); + _scumm->_imuse->stopAllSounds(); _scumm->_imuse->clear_queue(); } else if (_scumm->_playerV2) { _scumm->_playerV2->stopAllSounds(); |