[Scummvm-cvs-logs] CVS: scummvm/sound mixer.cpp,1.108,1.109 mixer.h,1.39,1.40

[Robert G?ffringmann]

Update of /cvsroot/scummvm/scummvm/sound
In directory sc8-pr-cvs1:/tmp/cvs-serv27811/sound

Modified Files:
	mixer.cpp mixer.h 
Log Message:
added SoundMixer::pauseChannels for pausing SFX and keeping adlib music running (needed by BASS when menu bar drops down)

Index: mixer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mixer.cpp,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -d -r1.108 -r1.109
--- mixer.cpp	6 Aug 2003 17:13:04 -0000	1.108
+++ mixer.cpp	9 Aug 2003 19:19:27 -0000	1.109
@@ -121,6 +121,7 @@
 	_musicVolume = 0;
 
 	_paused = false;
+	_channelsPaused = false;
 
 	for (i = 0; i != NUM_CHANNELS; i++)
 		_channels[i] = NULL;
@@ -237,7 +238,7 @@
 		memset(buf, 0, 2 * len * sizeof(int16));
 	}
 
-	if (!_paused) {
+	if (!_paused && !_channelsPaused) {
 		// now mix all channels
 		for (int i = 0; i != NUM_CHANNELS; i++)
 			if (_channels[i])
@@ -312,6 +313,10 @@
 
 void SoundMixer::pause(bool paused) {
 	_paused = paused;
+}
+
+void SoundMixer::pauseChannels(bool paused) {
+	_channelsPaused = paused;
 }
 
 bool SoundMixer::hasActiveSFXChannel() {

Index: mixer.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mixer.h,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- mixer.h	5 Aug 2003 23:03:42 -0000	1.39
+++ mixer.h	9 Aug 2003 19:19:27 -0000	1.40
@@ -73,7 +73,7 @@
 	int _globalVolume;
 	int _musicVolume;
 
-	bool _paused;
+	bool _paused, _channelsPaused;
 
 	Channel *_channels[NUM_CHANNELS];
 
@@ -126,6 +126,9 @@
 
 	/** pause - unpause */
 	void pause(bool paused);
+
+	/** pause - unpause channels, keep adlib music running */
+	void pauseChannels(bool paused);
 
 	/** set the global volume, 0-256 */
 	void setVolume(int volume);