aboutsummaryrefslogtreecommitdiff
path: root/engines/m4
diff options
context:
space:
mode:
authorMax Horn2010-01-19 22:30:33 +0000
committerMax Horn2010-01-19 22:30:33 +0000
commitdc5e08e623453aef8bbd92c484dde26d67d91d1e (patch)
tree44a32a70bcb683d9d4adb6d9cbd9aa8c641fa7fa /engines/m4
parent68826c27daabe92782053c17c838ef585cad28c8 (diff)
downloadscummvm-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/m4')
-rw-r--r--engines/m4/sound.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/m4/sound.cpp b/engines/m4/sound.cpp
index e9e1726dc3..cf2f54fb9a 100644
--- a/engines/m4/sound.cpp
+++ b/engines/m4/sound.cpp
@@ -90,10 +90,10 @@ void Sound::playSound(const char *soundName, int volume, bool loop, int channel)
_vm->res()->toss(soundName);
handle->type = kEffectHandle;
- flags = Audio::Mixer::FLAG_UNSIGNED;
+ flags = Audio::FLAG_UNSIGNED;
if (loop)
- flags |= Audio::Mixer::FLAG_LOOP;
+ flags |= Audio::FLAG_LOOP;
_vm->res()->toss(soundName);
@@ -146,7 +146,7 @@ void Sound::playVoice(const char *soundName, int volume) {
soundStream->read(buffer, soundStream->size());
handle->type = kEffectHandle;
- flags = Audio::Mixer::FLAG_UNSIGNED;
+ flags = Audio::FLAG_UNSIGNED;
_vm->res()->toss(soundName);
@@ -250,10 +250,10 @@ void Sound::playDSRSound(int soundIndex, int volume, bool loop) {
SndHandle *handle = getHandle();
handle->type = kEffectHandle;
- flags = Audio::Mixer::FLAG_UNSIGNED;
+ flags = Audio::FLAG_UNSIGNED;
if (loop)
- flags |= Audio::Mixer::FLAG_LOOP;
+ flags |= Audio::FLAG_LOOP;
// Get sound data
FabDecompressor fab;