Move raw audio flags from sound/mixer.h to sound/raw.h

svn-id: r47395

4 files changed, 20 insertions, 12 deletions

diff --git a/graphics/video/avi_decoder.cpp b/graphics/video/avi_decoder.cpp
index 704ad36320..61cd8553d4 100644
--- a/graphics/video/avi_decoder.cpp
+++ b/graphics/video/avi_decoder.cpp
@@ -31,6 +31,7 @@
 
 #include "sound/audiostream.h"
 #include "sound/mixer.h"
+#include "sound/raw.h"
 
 #include "graphics/video/avi_decoder.h"
 
@@ -325,9 +326,9 @@ Surface *AviDecoder::getNextFrame() {
 
 		byte flags = 0;
 		if (_audsHeader.sampleSize == 2)
-			flags |= Audio::Mixer::FLAG_16BITS | Audio::Mixer::FLAG_LITTLE_ENDIAN;
+			flags |= Audio::FLAG_16BITS | Audio::FLAG_LITTLE_ENDIAN;
 		else
-			flags |= Audio::Mixer::FLAG_UNSIGNED;
+			flags |= Audio::FLAG_UNSIGNED;
 
 		_audStream->queueBuffer(data, chunkSize, DisposeAfterUse::YES, flags);
 		_fileStream->skip(chunkSize & 1); // Alignment
diff --git a/graphics/video/coktelvideo/coktelvideo.cpp b/graphics/video/coktelvideo/coktelvideo.cpp
index 9f9c40b6ed..e3bf3f8493 100644
--- a/graphics/video/coktelvideo/coktelvideo.cpp
+++ b/graphics/video/coktelvideo/coktelvideo.cpp
@@ -33,6 +33,9 @@
 #include "graphics/dither.h"
 #include "graphics/video/coktelvideo/indeo3.h"
 
+#include "sound/audiostream.h"
+#include "sound/raw.h"
+
 namespace Graphics {
 
 Imd::Imd() {
@@ -2184,8 +2187,8 @@ void Vmd::emptySoundSlice(uint32 size) {
 
 	if (sound) {
 		uint32 flags = 0;
-		flags |= (_soundBytesPerSample == 2) ? Audio::Mixer::FLAG_16BITS : 0;
-		flags |= (_soundStereo > 0) ? Audio::Mixer::FLAG_STEREO : 0;
+		flags |= (_soundBytesPerSample == 2) ? Audio::FLAG_16BITS : 0;
+		flags |= (_soundStereo > 0) ? Audio::FLAG_STEREO : 0;
 
 		_audioStream->queueBuffer(sound, size, DisposeAfterUse::YES, flags);
 	}
@@ -2202,8 +2205,8 @@ void Vmd::filledSoundSlice(uint32 size) {
 
 	if (sound) {
 		uint32 flags = 0;
-		flags |= (_soundBytesPerSample == 2) ? Audio::Mixer::FLAG_16BITS : 0;
-		flags |= (_soundStereo > 0) ? Audio::Mixer::FLAG_STEREO : 0;
+		flags |= (_soundBytesPerSample == 2) ? Audio::FLAG_16BITS : 0;
+		flags |= (_soundStereo > 0) ? Audio::FLAG_STEREO : 0;
 
 		_audioStream->queueBuffer(sound, size, DisposeAfterUse::YES, flags);
 	}
diff --git a/graphics/video/coktelvideo/coktelvideo.h b/graphics/video/coktelvideo/coktelvideo.h
index f0165cfb76..95176cd287 100644
--- a/graphics/video/coktelvideo/coktelvideo.h
+++ b/graphics/video/coktelvideo/coktelvideo.h
@@ -38,7 +38,10 @@
 #include "common/array.h"
 #include "graphics/dither.h"
 #include "sound/mixer.h"
-#include "sound/audiostream.h"
+
+namespace Audio {
+	class QueuingAudioStream;
+}
 
 namespace Graphics {
 
diff --git a/graphics/video/smk_decoder.cpp b/graphics/video/smk_decoder.cpp
index 991ebbf589..437d72e5df 100644
--- a/graphics/video/smk_decoder.cpp
+++ b/graphics/video/smk_decoder.cpp
@@ -35,8 +35,9 @@
 #include "common/stream.h"
 #include "common/system.h"
 
-#include "sound/mixer.h"
 #include "sound/audiostream.h"
+#include "sound/mixer.h"
+#include "sound/raw.h"
 
 namespace Graphics {
 
@@ -574,9 +575,9 @@ bool SmackerDecoder::decodeNextFrame() {
 				// Uncompressed audio (PCM)
 				byte flags = 0;
 				if (_header.audioInfo[0].is16Bits)
-					flags = flags | Audio::Mixer::FLAG_16BITS;
+					flags = flags | Audio::FLAG_16BITS;
 				if (_header.audioInfo[0].isStereo)
-					flags = flags | Audio::Mixer::FLAG_STEREO;
+					flags = flags | Audio::FLAG_STEREO;
 
 				_audioStream->queueBuffer(soundBuffer, chunkSize, DisposeAfterUse::YES, flags);
 				// The sound buffer will be deleted by QueuingAudioStream
@@ -829,9 +830,9 @@ void SmackerDecoder::queueCompressedBuffer(byte *buffer, uint32 bufferSize,
 
 	byte flags = 0;
 	if (_header.audioInfo[0].is16Bits)
-		flags = flags | Audio::Mixer::FLAG_16BITS;
+		flags = flags | Audio::FLAG_16BITS;
 	if (_header.audioInfo[0].isStereo)
-		flags = flags | Audio::Mixer::FLAG_STEREO;
+		flags = flags | Audio::FLAG_STEREO;
 	_audioStream->queueBuffer(unpackedBuffer, unpackedSize, DisposeAfterUse::YES, flags);
 	// unpackedBuffer will be deleted by QueuingAudioStream
 }