aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/imuse_digi/dimuse.cpp
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/scumm/imuse_digi/dimuse.cpp
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/scumm/imuse_digi/dimuse.cpp')
-rw-r--r--engines/scumm/imuse_digi/dimuse.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/engines/scumm/imuse_digi/dimuse.cpp b/engines/scumm/imuse_digi/dimuse.cpp
index 43c72bc7ad..55fc66f058 100644
--- a/engines/scumm/imuse_digi/dimuse.cpp
+++ b/engines/scumm/imuse_digi/dimuse.cpp
@@ -35,6 +35,7 @@
#include "sound/audiostream.h"
#include "sound/mixer.h"
+#include "sound/raw.h"
namespace Scumm {
@@ -78,13 +79,13 @@ IMuseDigital::~IMuseDigital() {
int32 IMuseDigital::makeMixerFlags(int32 flags) {
int32 mixerFlags = 0;
if (flags & kFlagUnsigned)
- mixerFlags |= Audio::Mixer::FLAG_UNSIGNED;
+ mixerFlags |= Audio::FLAG_UNSIGNED;
if (flags & kFlag16Bits)
- mixerFlags |= Audio::Mixer::FLAG_16BITS;
+ mixerFlags |= Audio::FLAG_16BITS;
if (flags & kFlagLittleEndian)
- mixerFlags |= Audio::Mixer::FLAG_LITTLE_ENDIAN;
+ mixerFlags |= Audio::FLAG_LITTLE_ENDIAN;
if (flags & kFlagStereo)
- mixerFlags |= Audio::Mixer::FLAG_STEREO;
+ mixerFlags |= Audio::FLAG_STEREO;
return mixerFlags;
}