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 /graphics/video/smk_decoder.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 'graphics/video/smk_decoder.cpp')
| -rw-r--r-- | graphics/video/smk_decoder.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/graphics/video/smk_decoder.cpp b/graphics/video/smk_decoder.cpp index 991ebbf589..437d72e5df 100644 --- a/graphics/video/smk_decoder.cpp +++ b/graphics/video/smk_decoder.cpp @@ -35,8 +35,9 @@ #include "common/stream.h" #include "common/system.h" -#include "sound/mixer.h" #include "sound/audiostream.h" +#include "sound/mixer.h" +#include "sound/raw.h" namespace Graphics { @@ -574,9 +575,9 @@ bool SmackerDecoder::decodeNextFrame() { // Uncompressed audio (PCM) byte flags = 0; if (_header.audioInfo[0].is16Bits) - flags = flags | Audio::Mixer::FLAG_16BITS; + flags = flags | Audio::FLAG_16BITS; if (_header.audioInfo[0].isStereo) - flags = flags | Audio::Mixer::FLAG_STEREO; + flags = flags | Audio::FLAG_STEREO; _audioStream->queueBuffer(soundBuffer, chunkSize, DisposeAfterUse::YES, flags); // The sound buffer will be deleted by QueuingAudioStream @@ -829,9 +830,9 @@ void SmackerDecoder::queueCompressedBuffer(byte *buffer, uint32 bufferSize, byte flags = 0; if (_header.audioInfo[0].is16Bits) - flags = flags | Audio::Mixer::FLAG_16BITS; + flags = flags | Audio::FLAG_16BITS; if (_header.audioInfo[0].isStereo) - flags = flags | Audio::Mixer::FLAG_STEREO; + flags = flags | Audio::FLAG_STEREO; _audioStream->queueBuffer(unpackedBuffer, unpackedSize, DisposeAfterUse::YES, flags); // unpackedBuffer will be deleted by QueuingAudioStream } |