[Scummvm-cvs-logs] CVS: scummvm/sound mididrv.h,1.14,1.15 mixer.h,1.14,1.15

[Max Horn]

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

Modified Files:
	mididrv.h mixer.h 
Log Message:
fix -pedantic warnings

Index: mididrv.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mididrv.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- mididrv.h	21 Dec 2002 21:32:45 -0000	1.14
+++ mididrv.h	25 Dec 2002 00:36:04 -0000	1.15
@@ -37,12 +37,12 @@
 		MERR_CANNOT_CONNECT = 1,
 //		MERR_STREAMING_NOT_AVAILABLE = 2,
 		MERR_DEVICE_NOT_AVAILABLE = 3,
-		MERR_ALREADY_OPEN = 4,
+		MERR_ALREADY_OPEN = 4
 	};
 
 	enum {
 		PROP_TIMEDIV = 1,
-		PROP_SMALLHEADER = 2,
+		PROP_SMALLHEADER = 2
 	};
 
 

Index: mixer.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mixer.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- mixer.h	10 Nov 2002 16:23:02 -0000	1.14
+++ mixer.h	25 Dec 2002 00:36:04 -0000	1.15
@@ -174,7 +174,7 @@
 	bool _paused;
 
 	enum {
-		NUM_CHANNELS = 16,
+		NUM_CHANNELS = 16
 	};
 
 	void * _premixParam;
@@ -193,16 +193,16 @@
 	void unInsert(Channel * chan);
 	void beginSlots(int index);
 
-	/* start playing a raw sound */
+	// start playing a raw sound
 	enum {
-		/* Do *NOT* change any of these flags without looking at the code in mixer.cpp */
-		FLAG_UNSIGNED = 1,					/* unsigned samples */
-		FLAG_STEREO = 2,						/* sound is in stereo */
-		FLAG_16BITS = 4,						/* sound is 16 bits wide */
-		FLAG_AUTOFREE = 8,					/* sound buffer is freed automagically at the end of playing */
-		FLAG_FILE = 16,							/* sound is a FILE * that's read from */
-		FLAG_REVERSE_STEREO = 32,		/* sound should be reverse stereo */
-		FLAG_LOOP = 64,				/* loop the audio */
+		// Do *NOT* change any of these flags without looking at the code in mixer.cpp
+		FLAG_UNSIGNED = 1,          // unsigned samples
+		FLAG_STEREO = 2,            // sound is in stereo
+		FLAG_16BITS = 4,            // sound is 16 bits wide
+		FLAG_AUTOFREE = 8,          // sound buffer is freed automagically at the end of playing
+		FLAG_FILE = 16,             // sound is a FILE * that's read from
+		FLAG_REVERSE_STEREO = 32,   // sound should be reverse stereo
+		FLAG_LOOP = 64              // loop the audio
 	};
 	int playRaw(PlayingSoundHandle * handle, void * sound, uint32 size, uint rate, byte flags);
 	int playRaw(PlayingSoundHandle * handle, void * sound, uint32 size, uint rate, byte flags, int id);