[Scummvm-cvs-logs] CVS: scummvm/sky sound.cpp,1.39,1.40 sound.h,1.19,1.20
Robert G?ffringmann
lavosspawn at users.sourceforge.net
Sat Oct 25 07:29:21 CEST 2003
Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1:/tmp/cvs-serv20349/sky
Modified Files:
sound.cpp sound.h
Log Message:
fix bug #828222: Adlib music stops during browsing the inventory
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sound.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- sound.cpp 5 Oct 2003 20:21:20 -0000 1.39
+++ sound.cpp 25 Oct 2003 14:25:24 -0000 1.40
@@ -1252,3 +1252,15 @@
_mixer->playRaw(&_ingameSpeech, playBuffer, speechSize, 11025, SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_AUTOFREE, SOUND_SPEECH);
return true;
}
+
+void SkySound::fnPauseFx(void) {
+
+ _mixer->pauseChannel(SOUND_CH0, true);
+ _mixer->pauseChannel(SOUND_CH1, true);
+}
+
+void SkySound::fnUnPauseFx(void) {
+
+ _mixer->pauseChannel(SOUND_CH0, false);
+ _mixer->pauseChannel(SOUND_CH1, false);
+}
Index: sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sound.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- sound.h 5 Oct 2003 20:21:20 -0000 1.19
+++ sound.h 25 Oct 2003 14:25:24 -0000 1.20
@@ -70,8 +70,8 @@
void fnStartFx(uint32 sound, uint8 channel);
bool startSpeech(uint16 textNum);
bool speechFinished(void) { return _ingameSpeech == 0; };
- void fnPauseFx(void) { _mixer->pauseAll(true); };
- void fnUnPauseFx(void) { _mixer->pauseAll(false); };
+ void fnPauseFx(void);
+ void fnUnPauseFx(void);
void fnStopFx(void);
void stopSpeech(void);
void checkFxQueue(void);
More information about the Scummvm-git-logs
mailing list