From dc5e08e623453aef8bbd92c484dde26d67d91d1e Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Tue, 19 Jan 2010 22:30:33 +0000
Subject: Move raw audio flags from sound/mixer.h to sound/raw.h

svn-id: r47395
---
 engines/scumm/he/cup_player_he.cpp |  4 ++--
 engines/scumm/he/sound_he.cpp      | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'engines/scumm/he')

diff --git a/engines/scumm/he/cup_player_he.cpp b/engines/scumm/he/cup_player_he.cpp
index ea8f9e9f8a..fcf3c5477e 100644
--- a/engines/scumm/he/cup_player_he.cpp
+++ b/engines/scumm/he/cup_player_he.cpp
@@ -169,10 +169,10 @@ void CUP_Player::updateSfx() {
 			uint8 *soundData = _sfxBuffer + offset;
 			if (READ_BE_UINT32(soundData) == MKID_BE('DATA')) {
 				uint32 soundSize = READ_BE_UINT32(soundData + 4);
-				uint32 flags = Audio::Mixer::FLAG_UNSIGNED;
+				uint32 flags = Audio::FLAG_UNSIGNED;
 				uint32 loopEnd = 0;
 				if (sfx->flags & kSfxFlagLoop) {
-					flags |= Audio::Mixer::FLAG_LOOP;
+					flags |= Audio::FLAG_LOOP;
 					loopEnd = soundSize - 8;
 				}
 				_mixer->playInputStream(Audio::Mixer::kSFXSoundType, &sfxChannel->handle,
diff --git a/engines/scumm/he/sound_he.cpp b/engines/scumm/he/sound_he.cpp
index 64487568c3..5b19322290 100644
--- a/engines/scumm/he/sound_he.cpp
+++ b/engines/scumm/he/sound_he.cpp
@@ -532,7 +532,7 @@ void SoundHE::playHESound(int soundID, int heOffset, int heChannel, int heFlags)
 	byte *ptr, *spoolPtr;
 	int size = -1;
 	int priority, rate;
-	byte flags = Audio::Mixer::FLAG_UNSIGNED;
+	byte flags = Audio::FLAG_UNSIGNED;
 
 	Audio::Mixer::SoundType type = Audio::Mixer::kSFXSoundType;
 	if (soundID > _vm->_numSounds)
@@ -636,7 +636,7 @@ void SoundHE::playHESound(int soundID, int heOffset, int heChannel, int heFlags)
 
 		// TODO: Extra sound flags
 		if (heFlags & 1) {
-			flags |= Audio::Mixer::FLAG_LOOP;
+			flags |= Audio::FLAG_LOOP;
 			_heChannel[heChannel].timer = 0;
 		} else {
 			_heChannel[heChannel].timer = size * 1000 / rate;
@@ -644,7 +644,7 @@ void SoundHE::playHESound(int soundID, int heOffset, int heChannel, int heFlags)
 
 		_mixer->stopHandle(_heSoundChannels[heChannel]);
 		if (compType == 17) {
-			Audio::AudioStream *voxStream = Audio::makeADPCMStream(&memStream, false, size, Audio::kADPCMMSIma, rate, (flags & Audio::Mixer::FLAG_STEREO) ? 2 : 1, blockAlign);
+			Audio::AudioStream *voxStream = Audio::makeADPCMStream(&memStream, false, size, Audio::kADPCMMSIma, rate, (flags & Audio::FLAG_STEREO) ? 2 : 1, blockAlign);
 
 			// FIXME: Get rid of this crude hack to turn a ADPCM stream into a raw stream.
 			// It seems it is only there to allow looping -- if that is true, we certainly
@@ -666,7 +666,7 @@ void SoundHE::playHESound(int soundID, int heOffset, int heChannel, int heFlags)
 			// makeADPCMStream returns a stream in native endianness, but RawMemoryStream
 			// defaults to big endian. If we're on a little endian system, set the LE flag.
 #ifdef SCUMM_LITTLE_ENDIAN
-			flags |= Audio::Mixer::FLAG_LITTLE_ENDIAN;
+			flags |= Audio::FLAG_LITTLE_ENDIAN;
 #endif
 			stream = Audio::makeRawMemoryStream(sound + heOffset, size - heOffset, DisposeAfterUse::YES, rate, flags, 0, 0);
 		} else {
@@ -722,7 +722,7 @@ void SoundHE::playHESound(int soundID, int heOffset, int heChannel, int heFlags)
 
 		// TODO: Extra sound flags
 		if (heFlags & 1) {
-			flags |= Audio::Mixer::FLAG_LOOP;
+			flags |= Audio::FLAG_LOOP;
 			_heChannel[heChannel].timer = 0;
 		} else {
 			_heChannel[heChannel].timer = size * 1000 / rate;
-- 
cgit v1.2.3