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/made | |
| 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/made')
| -rw-r--r-- | engines/made/pmvplayer.cpp | 4 | ||||
| -rw-r--r-- | engines/made/resource.cpp | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/engines/made/pmvplayer.cpp b/engines/made/pmvplayer.cpp index f65678c510..5e96fdc206 100644 --- a/engines/made/pmvplayer.cpp +++ b/engines/made/pmvplayer.cpp @@ -26,6 +26,8 @@ #include "made/pmvplayer.h" #include "made/screen.h" +#include "sound/raw.h" + namespace Made { PmvPlayer::PmvPlayer(MadeEngine *vm, Audio::Mixer *mixer) : _fd(NULL), _vm(vm), _mixer(mixer) { @@ -140,7 +142,7 @@ bool PmvPlayer::play(const char *filename) { soundSize = chunkCount * chunkSize; soundData = (byte *)malloc(soundSize); decompressSound(audioData + 8, soundData, chunkSize, chunkCount); - _audioStream->queueBuffer(soundData, soundSize, DisposeAfterUse::YES, Audio::Mixer::FLAG_UNSIGNED); + _audioStream->queueBuffer(soundData, soundSize, DisposeAfterUse::YES, Audio::FLAG_UNSIGNED); } // Handle palette diff --git a/engines/made/resource.cpp b/engines/made/resource.cpp index 7edddbb644..b29e1b8fb0 100644 --- a/engines/made/resource.cpp +++ b/engines/made/resource.cpp @@ -261,9 +261,9 @@ void SoundResource::load(byte *source, int size) { } Audio::AudioStream *SoundResource::getAudioStream(int soundRate, bool loop) { - byte flags = Audio::Mixer::FLAG_UNSIGNED; + byte flags = Audio::FLAG_UNSIGNED; if (loop) - flags |= Audio::Mixer::FLAG_LOOP; + flags |= Audio::FLAG_LOOP; return Audio::makeRawMemoryStream(_soundData, _soundSize, DisposeAfterUse::NO, soundRate, flags, 0, 0); } |