diff options
| author | Sven Hesse | 2007-01-31 15:19:42 +0000 |
|---|---|---|
| committer | Sven Hesse | 2007-01-31 15:19:42 +0000 |
| commit | 17e70efe13a77d94a78e09591ab84ed78abcdda0 (patch) | |
| tree | 16259078aaba55997d8d97fdb2926e26fa30e37b /engines/gob/sound.cpp | |
| parent | 1880aa544126be80b95351a9ba3199f7b6721f9d (diff) | |
| download | scummvm-rg350-17e70efe13a77d94a78e09591ab84ed78abcdda0.tar.gz scummvm-rg350-17e70efe13a77d94a78e09591ab84ed78abcdda0.tar.bz2 scummvm-rg350-17e70efe13a77d94a78e09591ab84ed78abcdda0.zip | |
- Snd::WaitEndPlay() should stop a running composition
- Removed Snd::getCompositionSlot(), it's not needed
svn-id: r25310
Diffstat (limited to 'engines/gob/sound.cpp')
| -rw-r--r-- | engines/gob/sound.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/engines/gob/sound.cpp b/engines/gob/sound.cpp index 787a948deb..c29c8ff80d 100644 --- a/engines/gob/sound.cpp +++ b/engines/gob/sound.cpp @@ -101,13 +101,6 @@ void Snd::speakerOff(void) { _vm->_mixer->stopHandle(_speakerHandle); } -int8 Snd::getCompositionSlot(void) { - if (_compositionPos == -1) - return -1; - - return _composition[_compositionPos]; -} - void Snd::stopSound(int16 fadeLength) { Common::StackLock slock(_mutex); @@ -127,6 +120,7 @@ void Snd::stopSound(int16 fadeLength) } void Snd::waitEndPlay(void) { + _compositionPos = -1; while (!_end && !_vm->_quitRequested) _vm->_util->longDelay(200); stopSound(0); |