diff options
| author | Lionel Ulmer | 2002-05-18 14:53:19 +0000 |
|---|---|---|
| committer | Lionel Ulmer | 2002-05-18 14:53:19 +0000 |
| commit | 3b4c6ceb0f621b68a5a44922d7218987faedb10e (patch) | |
| tree | 55d9b1ff3d1cb7fb60612360eef2d26b87167d86 /sound/mixer.h | |
| parent | 53f993be44ac34c3f17677cb432a366dec962824 (diff) | |
| download | scummvm-rg350-3b4c6ceb0f621b68a5a44922d7218987faedb10e.tar.gz scummvm-rg350-3b4c6ceb0f621b68a5a44922d7218987faedb10e.tar.bz2 scummvm-rg350-3b4c6ceb0f621b68a5a44922d7218987faedb10e.zip | |
Added infrastructure to support more than 8 bit signed / unsigned RAW
mixers. Porters, beware, the default configuration is now 16 bit
stereo instead of 16 mono as before (I changed X11 and SDL but no
others).
I did not add support for any other format yet, I will let Endy do it
when he needs it :-)
svn-id: r4348
Diffstat (limited to 'sound/mixer.h')
| -rw-r--r-- | sound/mixer.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sound/mixer.h b/sound/mixer.h index 2e88fbe96b..fc9d687f15 100644 --- a/sound/mixer.h +++ b/sound/mixer.h @@ -131,9 +131,12 @@ public: /* start playing a raw sound */ enum { - FLAG_AUTOFREE = 1, - FLAG_UNSIGNED = 2, /* unsigned samples */ - FLAG_FILE = 4, /* sound is a FILE * that's read from */ + /* 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 */ }; int play_raw(PlayingSoundHandle *handle, void *sound, uint32 size, uint rate, byte flags); #ifdef COMPRESSED_SOUND_FILE |