[Scummvm-cvs-logs] CVS: scummvm/sound mixer.cpp,1.175,1.176 mixer.h,1.89,1.90

[Max Horn]

Update of /cvsroot/scummvm/scummvm/sound
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8284

Modified Files:
	mixer.cpp mixer.h 
Log Message:
Allow premix channels to use a custom sound type

Index: mixer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mixer.cpp,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -d -r1.175 -r1.176
--- mixer.cpp	27 Dec 2004 00:26:59 -0000	1.175
+++ mixer.cpp	27 Dec 2004 02:58:55 -0000	1.176
@@ -136,7 +136,7 @@
 	return _paused;
 }
 
-void SoundMixer::setupPremix(AudioStream *stream) {
+void SoundMixer::setupPremix(AudioStream *stream, SoundType type) {
 	Common::StackLock lock(_mutex);
 
 	delete _premixChannel;
@@ -146,7 +146,7 @@
 		return;
 
 	// Create the channel
-	_premixChannel = new Channel(this, 0, kPlainAudioDataType, stream, false);
+	_premixChannel = new Channel(this, 0, type, stream, false);
 }
 
 void SoundMixer::insertChannel(PlayingSoundHandle *handle, Channel *chan) {

Index: mixer.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mixer.h,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -r1.89 -r1.90
--- mixer.h	27 Dec 2004 01:32:40 -0000	1.89
+++ mixer.h	27 Dec 2004 02:58:55 -0000	1.90
@@ -120,7 +120,7 @@
 	 * is not limited to it. The premix stream is invoked by the mixer whenever
 	 * it needs to generate any data, before any other mixing takes place.
 	 */
-	void setupPremix(AudioStream *stream);
+	void setupPremix(AudioStream *stream, SoundType type = kPlainAudioDataType);