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/gob/sound/sounddesc.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'engines/gob/sound/sounddesc.cpp')

diff --git a/engines/gob/sound/sounddesc.cpp b/engines/gob/sound/sounddesc.cpp
index e8045d21f7..6cd55678cf 100644
--- a/engines/gob/sound/sounddesc.cpp
+++ b/engines/gob/sound/sounddesc.cpp
@@ -26,6 +26,7 @@
 #include "common/util.h"
 #include "common/stream.h"
 #include "sound/mixer.h"
+#include "sound/raw.h"
 #include "sound/wave.h"
 
 #include "gob/sound/sounddesc.h"
@@ -120,7 +121,7 @@ void SoundDesc::convToSigned() {
 	if (!_data || !_dataPtr)
 		return;
 
-	if (_mixerFlags & Audio::Mixer::FLAG_16BITS) {
+	if (_mixerFlags & Audio::FLAG_16BITS) {
 		byte *data = _dataPtr;
 		for (uint32 i = 0; i < _size; i++, data += 2)
 			WRITE_LE_UINT16(data, READ_LE_UINT16(data) ^ 0x8000);
@@ -163,12 +164,12 @@ bool SoundDesc::loadWAV(byte *data, uint32 dSize) {
 	if (!Audio::loadWAVFromStream(stream, wavSize, wavRate, wavFlags, &wavtype, 0))
 		return false;
 
-	if (wavFlags & Audio::Mixer::FLAG_16BITS) {
-		_mixerFlags |= Audio::Mixer::FLAG_16BITS;
+	if (wavFlags & Audio::FLAG_16BITS) {
+		_mixerFlags |= Audio::FLAG_16BITS;
 		wavSize >>= 1;
 	}
 
-	if (wavFlags & Audio::Mixer::FLAG_STEREO) {
+	if (wavFlags & Audio::FLAG_STEREO) {
 		warning("TODO: SoundDesc::loadWAV() - stereo");
 		return false;
 	}
@@ -178,7 +179,7 @@ bool SoundDesc::loadWAV(byte *data, uint32 dSize) {
 	_size = wavSize;
 	_frequency = wavRate;
 
-	if (wavFlags & Audio::Mixer::FLAG_UNSIGNED)
+	if (wavFlags & Audio::FLAG_UNSIGNED)
 		convToSigned();
 
 	return true;
-- 
cgit v1.2.3