[Scummvm-cvs-logs] SF.net SVN: scummvm: [25310] scummvm/trunk/engines/gob
drmccoy at users.sourceforge.net
drmccoy at users.sourceforge.net
Wed Jan 31 16:19:43 CET 2007
Revision: 25310
http://scummvm.svn.sourceforge.net/scummvm/?rev=25310&view=rev
Author: drmccoy
Date: 2007-01-31 07:19:42 -0800 (Wed, 31 Jan 2007)
Log Message:
-----------
- Snd::WaitEndPlay() should stop a running composition
- Removed Snd::getCompositionSlot(), it's not needed
Modified Paths:
--------------
scummvm/trunk/engines/gob/game.cpp
scummvm/trunk/engines/gob/sound.cpp
scummvm/trunk/engines/gob/sound.h
Modified: scummvm/trunk/engines/gob/game.cpp
===================================================================
--- scummvm/trunk/engines/gob/game.cpp 2007-01-31 14:53:46 UTC (rev 25309)
+++ scummvm/trunk/engines/gob/game.cpp 2007-01-31 15:19:42 UTC (rev 25310)
@@ -351,13 +351,6 @@
if ((slot < 0) || (slot >= 60) || (_soundSamples[slot] == 0))
return;
- if (slot == _vm->_snd->getCompositionSlot()) {
- if (_vm->_quitRequested)
- _vm->_snd->stopComposition();
- else
- _vm->_snd->waitEndPlay();
- }
-
if (_soundADL[slot]) {
if (_vm->_adlib && (_vm->_adlib->getIndex() == slot))
_vm->_adlib->stopPlay();
Modified: scummvm/trunk/engines/gob/sound.cpp
===================================================================
--- scummvm/trunk/engines/gob/sound.cpp 2007-01-31 14:53:46 UTC (rev 25309)
+++ scummvm/trunk/engines/gob/sound.cpp 2007-01-31 15:19:42 UTC (rev 25310)
@@ -101,13 +101,6 @@
_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::waitEndPlay(void) {
+ _compositionPos = -1;
while (!_end && !_vm->_quitRequested)
_vm->_util->longDelay(200);
stopSound(0);
Modified: scummvm/trunk/engines/gob/sound.h
===================================================================
--- scummvm/trunk/engines/gob/sound.h 2007-01-31 14:53:46 UTC (rev 25309)
+++ scummvm/trunk/engines/gob/sound.h 2007-01-31 15:19:42 UTC (rev 25310)
@@ -56,7 +56,6 @@
void playSample(SoundDesc *sndDesc, int16 repCount, int16 frequency, int16 fadeLength = 0);
void playComposition(int16 *composition, int16 freqVal);
void stopComposition(void);
- int8 getCompositionSlot(void);
void waitEndPlay(void);
// This deletes sndDesc and stops playing the sample.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list