[Scummvm-cvs-logs] CVS: scummvm/sound mixer.h,1.86,1.87

Max Horn fingolfin at users.sourceforge.net
Sun Nov 28 15:25:03 CET 2004


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

Modified Files:
	mixer.h 
Log Message:
cleanup

Index: mixer.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mixer.h,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -d -r1.86 -r1.87
--- mixer.h	28 Nov 2004 23:02:27 -0000	1.86
+++ mixer.h	28 Nov 2004 23:24:32 -0000	1.87
@@ -46,12 +46,6 @@
 
 class SoundMixer {
 public:
-	typedef void PremixProc (void *param, int16 *data, uint len);
-
-	enum {
-		NUM_CHANNELS = 16
-	};
-
 	enum {
 		/** unsigned samples (default: signed) */
 		FLAG_UNSIGNED = 1 << 0,
@@ -76,6 +70,10 @@
 	};
 
 private:
+	enum {
+		NUM_CHANNELS = 16
+	};
+
 	OSystem *_syst;
 	OSystem::MutexRef _mutex;
 





More information about the Scummvm-git-logs mailing list