diff options
| author | Max Horn | 2002-12-25 00:36:04 +0000 |
|---|---|---|
| committer | Max Horn | 2002-12-25 00:36:04 +0000 |
| commit | ce6913cf3666f9234d5b8a0b40e2959b8f7754a5 (patch) | |
| tree | 00a08e02f3b226a461d5b48f63e97bc285291740 /sound/mixer.h | |
| parent | 7cb69f7fa2f17eca5a1ad08162ce9e5e5a2cb5e4 (diff) | |
| download | scummvm-rg350-ce6913cf3666f9234d5b8a0b40e2959b8f7754a5.tar.gz scummvm-rg350-ce6913cf3666f9234d5b8a0b40e2959b8f7754a5.tar.bz2 scummvm-rg350-ce6913cf3666f9234d5b8a0b40e2959b8f7754a5.zip | |
fix -pedantic warnings
svn-id: r6108
Diffstat (limited to 'sound/mixer.h')
| -rw-r--r-- | sound/mixer.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sound/mixer.h b/sound/mixer.h index 599ce2e21f..c4c7733881 100644 --- a/sound/mixer.h +++ b/sound/mixer.h @@ -174,7 +174,7 @@ public: bool _paused; enum { - NUM_CHANNELS = 16, + NUM_CHANNELS = 16 }; void * _premixParam; @@ -193,16 +193,16 @@ public: 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); |