[Scummvm-cvs-logs] CVS: residual/mixer mixer.cpp,1.8,1.9

Pawel Kolodziejski aquadran at users.sourceforge.net
Wed Jan 12 14:33:14 CET 2005


Update of /cvsroot/scummvm/residual/mixer
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18862/residual/mixer

Modified Files:
	mixer.cpp 
Log Message:
fixed some mixer warnings

Index: mixer.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/mixer/mixer.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- mixer.cpp	1 Jan 2005 12:27:57 -0000	1.8
+++ mixer.cpp	12 Jan 2005 22:32:45 -0000	1.9
@@ -376,7 +376,7 @@
 }
 
 
-Channel::Channel(SoundMixer *mixer, PlayingSoundHandle *handle, bool isMusic, int id)
+Channel::Channel(SoundMixer *mixer, PlayingSoundHandle *handle, bool /*isMusic*/, int id)
 	: _mixer(mixer), _handle(handle), _autofreeStream(true),
 	  _volume(255), _balance(0), _paused(false), _id(id), _samplesConsumed(0),
 	  _samplesDecoded(0), _converter(0), _input(NULL) {
@@ -384,10 +384,10 @@
 }
 
 Channel::Channel(SoundMixer *mixer, PlayingSoundHandle *handle, AudioStream *input,
-				bool autofreeStream, bool isMusic, bool reverseStereo, int id, bool permanent)
+				bool autofreeStream, bool /*isMusic*/, bool reverseStereo, int id, bool permanent)
 	: _mixer(mixer), _handle(handle), _autofreeStream(autofreeStream),
-	  _volume(255), _balance(0), _paused(false), _id(id), _samplesConsumed(0),
-	  _samplesDecoded(0), _converter(0), _input(input), _permanent(permanent) {
+	  _permanent(permanent), _volume(255), _balance(0), _paused(false), _id(id),
+	  _samplesConsumed(0), _samplesDecoded(0), _converter(0), _input(input) {
 	assert(mixer);
 	assert(input);
 





More information about the Scummvm-git-logs mailing list