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/coktelvideo | |
| 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/coktelvideo')
| -rw-r--r-- | graphics/video/coktelvideo/coktelvideo.cpp | 11 | ||||
| -rw-r--r-- | graphics/video/coktelvideo/coktelvideo.h | 5 |
2 files changed, 11 insertions, 5 deletions
diff --git a/graphics/video/coktelvideo/coktelvideo.cpp b/graphics/video/coktelvideo/coktelvideo.cpp index 9f9c40b6ed..e3bf3f8493 100644 --- a/graphics/video/coktelvideo/coktelvideo.cpp +++ b/graphics/video/coktelvideo/coktelvideo.cpp @@ -33,6 +33,9 @@ #include "graphics/dither.h" #include "graphics/video/coktelvideo/indeo3.h" +#include "sound/audiostream.h" +#include "sound/raw.h" + namespace Graphics { Imd::Imd() { @@ -2184,8 +2187,8 @@ void Vmd::emptySoundSlice(uint32 size) { if (sound) { uint32 flags = 0; - flags |= (_soundBytesPerSample == 2) ? Audio::Mixer::FLAG_16BITS : 0; - flags |= (_soundStereo > 0) ? Audio::Mixer::FLAG_STEREO : 0; + flags |= (_soundBytesPerSample == 2) ? Audio::FLAG_16BITS : 0; + flags |= (_soundStereo > 0) ? Audio::FLAG_STEREO : 0; _audioStream->queueBuffer(sound, size, DisposeAfterUse::YES, flags); } @@ -2202,8 +2205,8 @@ void Vmd::filledSoundSlice(uint32 size) { if (sound) { uint32 flags = 0; - flags |= (_soundBytesPerSample == 2) ? Audio::Mixer::FLAG_16BITS : 0; - flags |= (_soundStereo > 0) ? Audio::Mixer::FLAG_STEREO : 0; + flags |= (_soundBytesPerSample == 2) ? Audio::FLAG_16BITS : 0; + flags |= (_soundStereo > 0) ? Audio::FLAG_STEREO : 0; _audioStream->queueBuffer(sound, size, DisposeAfterUse::YES, flags); } diff --git a/graphics/video/coktelvideo/coktelvideo.h b/graphics/video/coktelvideo/coktelvideo.h index f0165cfb76..95176cd287 100644 --- a/graphics/video/coktelvideo/coktelvideo.h +++ b/graphics/video/coktelvideo/coktelvideo.h @@ -38,7 +38,10 @@ #include "common/array.h" #include "graphics/dither.h" #include "sound/mixer.h" -#include "sound/audiostream.h" + +namespace Audio { + class QueuingAudioStream; +} namespace Graphics { |