diff options
| author | Max Horn | 2010-01-19 22:30:33 +0000 |
|---|---|---|
| committer | Max Horn | 2010-01-19 22:30:33 +0000 |
| commit | dc5e08e623453aef8bbd92c484dde26d67d91d1e (patch) | |
| tree | 44a32a70bcb683d9d4adb6d9cbd9aa8c641fa7fa /engines/gob/sound/sounddesc.cpp | |
| parent | 68826c27daabe92782053c17c838ef585cad28c8 (diff) | |
| download | scummvm-rg350-dc5e08e623453aef8bbd92c484dde26d67d91d1e.tar.gz scummvm-rg350-dc5e08e623453aef8bbd92c484dde26d67d91d1e.tar.bz2 scummvm-rg350-dc5e08e623453aef8bbd92c484dde26d67d91d1e.zip | |
Move raw audio flags from sound/mixer.h to sound/raw.h
svn-id: r47395
Diffstat (limited to 'engines/gob/sound/sounddesc.cpp')
| -rw-r--r-- | engines/gob/sound/sounddesc.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/engines/gob/sound/sounddesc.cpp b/engines/gob/sound/sounddesc.cpp index e8045d21f7..6cd55678cf 100644 --- a/engines/gob/sound/sounddesc.cpp +++ b/engines/gob/sound/sounddesc.cpp @@ -26,6 +26,7 @@ #include "common/util.h" #include "common/stream.h" #include "sound/mixer.h" +#include "sound/raw.h" #include "sound/wave.h" #include "gob/sound/sounddesc.h" @@ -120,7 +121,7 @@ void SoundDesc::convToSigned() { if (!_data || !_dataPtr) return; - if (_mixerFlags & Audio::Mixer::FLAG_16BITS) { + if (_mixerFlags & Audio::FLAG_16BITS) { byte *data = _dataPtr; for (uint32 i = 0; i < _size; i++, data += 2) WRITE_LE_UINT16(data, READ_LE_UINT16(data) ^ 0x8000); @@ -163,12 +164,12 @@ bool SoundDesc::loadWAV(byte *data, uint32 dSize) { if (!Audio::loadWAVFromStream(stream, wavSize, wavRate, wavFlags, &wavtype, 0)) return false; - if (wavFlags & Audio::Mixer::FLAG_16BITS) { - _mixerFlags |= Audio::Mixer::FLAG_16BITS; + if (wavFlags & Audio::FLAG_16BITS) { + _mixerFlags |= Audio::FLAG_16BITS; wavSize >>= 1; } - if (wavFlags & Audio::Mixer::FLAG_STEREO) { + if (wavFlags & Audio::FLAG_STEREO) { warning("TODO: SoundDesc::loadWAV() - stereo"); return false; } @@ -178,7 +179,7 @@ bool SoundDesc::loadWAV(byte *data, uint32 dSize) { _size = wavSize; _frequency = wavRate; - if (wavFlags & Audio::Mixer::FLAG_UNSIGNED) + if (wavFlags & Audio::FLAG_UNSIGNED) convToSigned(); return true; |