[Scummvm-cvs-logs] CVS: scummvm/sound mixer.cpp,1.131,1.132 mixer.h,1.59,1.60

[Max Horn]

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

Modified Files:
	mixer.cpp mixer.h 
Log Message:
cleanup

Index: mixer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mixer.cpp,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -d -r1.131 -r1.132
--- mixer.cpp	8 Nov 2003 23:05:04 -0000	1.131
+++ mixer.cpp	16 Dec 2003 15:34:16 -0000	1.132
@@ -57,22 +57,24 @@
 	virtual ~Channel();
 	void destroy();
 	virtual void mix(int16 *data, uint len);
-	virtual void pause(bool paused) {
+
+	virtual bool isMusicChannel() const	= 0;
+
+	void pause(bool paused) {
 		_paused = paused;
 	}
-	virtual bool isPaused() {
+	bool isPaused() {
 		return _paused;
 	}
-	virtual void setChannelVolume(const byte volume) {
+	void setChannelVolume(const byte volume) {
 		_volume = volume;
 	}
-	virtual void setChannelPan(const int8 pan) {
+	void setChannelPan(const int8 pan) {
 		_pan = pan;
 	}
-	virtual int getVolume() const {
+	int getVolume() const {
 		return isMusicChannel() ? _mixer->getMusicVolume() : _mixer->getVolume();
 	}
-	virtual bool isMusicChannel() const	= 0;
 };
 
 class ChannelRaw : public Channel {

Index: mixer.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mixer.h,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- mixer.h	16 Dec 2003 02:11:04 -0000	1.59
+++ mixer.h	16 Dec 2003 15:34:17 -0000	1.60
@@ -50,14 +50,13 @@
 	};
 
 	enum {
-		FLAG_UNSIGNED = 1 << 0,         // unsigned samples (default: signed)
-		FLAG_STEREO = 1 << 1,           // sound is in stereo (default: mono)
-		FLAG_16BITS = 1 << 2,           // sound is 16 bits wide (default: 8bit)
-		FLAG_AUTOFREE = 1 << 3,         // sound buffer is freed automagically at the end of playing
-		FLAG_REVERSE_STEREO = 1 << 4,   // reverse the left and right stereo channel
-		FLAG_LOOP = 1 << 5,             // loop the audio
-		FLAG_LITTLE_ENDIAN = 1 << 6		// sample is little endian (default: big endian)
-			
+		FLAG_UNSIGNED = 1 << 0,         /** unsigned samples (default: signed) */
+		FLAG_16BITS = 1 << 1,           /** sound is 16 bits wide (default: 8bit) */
+		FLAG_LITTLE_ENDIAN = 1 << 2,    /** sample is little endian (default: big endian) */
+		FLAG_STEREO = 1 << 3,           /** sound is in stereo (default: mono) */
+		FLAG_REVERSE_STEREO = 1 << 4,   /** reverse the left and right stereo channel */
+		FLAG_AUTOFREE = 1 << 5,         /** sound buffer is freed automagically at the end of playing */
+		FLAG_LOOP = 1 << 6              /** loop the audio */
 	};
 
 private: