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/saga/music.cpp  |  4 ++--
 engines/saga/sndres.cpp | 27 ++++++++++++++-------------
 engines/saga/sound.cpp  |  2 +-
 3 files changed, 17 insertions(+), 16 deletions(-)

(limited to 'engines/saga')

diff --git a/engines/saga/music.cpp b/engines/saga/music.cpp
index 70b62dbd02..6d8eb1cff1 100644
--- a/engines/saga/music.cpp
+++ b/engines/saga/music.cpp
@@ -304,8 +304,8 @@ void Music::play(uint32 resourceId, MusicFlags flags) {
 							(uint32)resData->offset + offs, (uint32)resData->offset + resData->size - offs);
 
 				if (!_digitalMusicContext->isCompressed()) {
-					byte musicFlags = Audio::Mixer::FLAG_STEREO | 
-										Audio::Mixer::FLAG_16BITS | Audio::Mixer::FLAG_LITTLE_ENDIAN;
+					byte musicFlags = Audio::FLAG_STEREO | 
+										Audio::FLAG_16BITS | Audio::FLAG_LITTLE_ENDIAN;
 					Audio::RawDiskStreamAudioBlock audioBlocks[1];
 					audioBlocks[0].pos = 0;
 					audioBlocks[0].len = resData->size / 2;	// 16-bit sound
diff --git a/engines/saga/sndres.cpp b/engines/saga/sndres.cpp
index 05dd6219a1..2a87df6711 100644
--- a/engines/saga/sndres.cpp
+++ b/engines/saga/sndres.cpp
@@ -34,14 +34,15 @@
 
 #include "common/file.h"
 
-#include "sound/voc.h"
-#include "sound/wave.h"
+#include "sound/audiostream.h"
 #include "sound/adpcm.h"
 #include "sound/aiff.h"
 #ifdef ENABLE_SAGA2
 #include "sound/shorten.h"
 #endif
-#include "sound/audiostream.h"
+#include "sound/raw.h"
+#include "sound/voc.h"
+#include "sound/wave.h"
 
 namespace Saga {
 
@@ -268,12 +269,12 @@ bool SndRes::load(ResourceContext *context, uint32 resourceId, SoundBuffer &buff
 	buffer.soundType = resourceType;
 	buffer.originalSize = 0;
 	// Set default flags and frequency for PCM, VOC and VOX files, which got no header
-	buffer.flags = Audio::Mixer::FLAG_16BITS;
+	buffer.flags = Audio::FLAG_16BITS;
 	buffer.frequency = 22050;
 	if (_vm->getGameId() == GID_ITE) {
 		if (_vm->getFeatures() & GF_8BIT_UNSIGNED_PCM) {	// older ITE demos
-			buffer.flags |= Audio::Mixer::FLAG_UNSIGNED;
-			buffer.flags &= ~Audio::Mixer::FLAG_16BITS;
+			buffer.flags |= Audio::FLAG_UNSIGNED;
+			buffer.flags &= ~Audio::FLAG_16BITS;
 		} else {
 			// Voice files in newer ITE demo versions are OKI ADPCM (VOX) encoded
 			if (!scumm_stricmp(context->fileName(), "voicesd.rsc"))
@@ -284,9 +285,9 @@ bool SndRes::load(ResourceContext *context, uint32 resourceId, SoundBuffer &buff
 
 	// Check for LE sounds
 	if (!context->isBigEndian())
-		buffer.flags |= Audio::Mixer::FLAG_LITTLE_ENDIAN;
+		buffer.flags |= Audio::FLAG_LITTLE_ENDIAN;
 	if ((context->fileType() & GAME_VOICEFILE) && (_vm->getFeatures() & GF_LE_VOICES))
-		buffer.flags |= Audio::Mixer::FLAG_LITTLE_ENDIAN;
+		buffer.flags |= Audio::FLAG_LITTLE_ENDIAN;
 
 	// Older Mac versions of ITE were Macbinary packed
 	int soundOffset = (context->fileType() & GAME_MACBINARY) ? 36 : 0;
@@ -329,7 +330,7 @@ bool SndRes::load(ResourceContext *context, uint32 resourceId, SoundBuffer &buff
 			result = (data != 0);
 			if (onlyHeader)
 				free(data);
-			buffer.flags |= Audio::Mixer::FLAG_UNSIGNED;
+			buffer.flags |= Audio::FLAG_UNSIGNED;
 		}
 
 		if (result) {
@@ -355,9 +356,9 @@ bool SndRes::load(ResourceContext *context, uint32 resourceId, SoundBuffer &buff
 		buffer.frequency = readS.readUint16LE();
 		buffer.originalSize = readS.readUint32LE();
 		if (readS.readByte() == 8)	// read sample bits
-			buffer.flags &= ~Audio::Mixer::FLAG_16BITS;
+			buffer.flags &= ~Audio::FLAG_16BITS;
 		if (readS.readByte() != 0)	// read stereo flag
-			buffer.flags |= Audio::Mixer::FLAG_STEREO;
+			buffer.flags |= Audio::FLAG_STEREO;
 
 		buffer.size = soundResourceLength;
 		buffer.soundType = resourceType;
@@ -404,10 +405,10 @@ int SndRes::getVoiceLength(uint32 resourceId) {
 	else
 		msDouble = (double)buffer.originalSize;
 
-	if (buffer.flags & Audio::Mixer::FLAG_16BITS)
+	if (buffer.flags & Audio::FLAG_16BITS)
 		msDouble /= 2.0;
 
-	if (buffer.flags & Audio::Mixer::FLAG_STEREO)
+	if (buffer.flags & Audio::FLAG_STEREO)
 		msDouble /= 2.0;
 
 	msDouble = msDouble / buffer.frequency * 1000.0;
diff --git a/engines/saga/sound.cpp b/engines/saga/sound.cpp
index 75b5c61ad9..39867c9f37 100644
--- a/engines/saga/sound.cpp
+++ b/engines/saga/sound.cpp
@@ -70,7 +70,7 @@ void Sound::playSoundBuffer(Audio::SoundHandle *handle, SoundBuffer &buffer, int
 	Audio::AudioStream *stream = 0;
 
 	if (loop)
-		buffer.flags |= Audio::Mixer::FLAG_LOOP;
+		buffer.flags |= Audio::FLAG_LOOP;
 
 	Audio::Mixer::SoundType soundType = (handleType == kVoiceHandle) ? 
 				Audio::Mixer::kSpeechSoundType : Audio::Mixer::kSFXSoundType;
-- 
cgit v1.2.3