Moved the AudioCDManager as well as class AudioStream and its (standard) subclasses to namespace Audio

svn-id: r22231

2 files changed, 7 insertions, 5 deletions

diff --git a/graphics/animation.cpp b/graphics/animation.cpp
index 3c0d0bab83..c1fb87f5b9 100644
--- a/graphics/animation.cpp
+++ b/graphics/animation.cpp
@@ -155,8 +155,8 @@ bool BaseAnimationState::init(const char *name, void *audioArg) {
 #endif
 }
 
-AudioStream *BaseAnimationState::createAudioStream(const char *name, void *arg) {
-	return AudioStream::openStreamFile(name);
+Audio::AudioStream *BaseAnimationState::createAudioStream(const char *name, void *arg) {
+	return Audio::AudioStream::openStreamFile(name);
 }
 
 bool BaseAnimationState::decodeFrame() {
diff --git a/graphics/animation.h b/graphics/animation.h
index 24b6f7e560..9b7f49352c 100644
--- a/graphics/animation.h
+++ b/graphics/animation.h
@@ -26,7 +26,9 @@
 #include "common/scummsys.h"
 #include "sound/mixer.h"
 
-class AudioStream;
+namespace Audio {
+	class AudioStream;
+}
 
 // Uncomment this if you are using libmpeg2 0.3.1.
 // #define USE_MPEG2_0_3_1
@@ -91,7 +93,7 @@ protected:
 	Common::File *_mpegFile;
 
 	Audio::SoundHandle _bgSound;
-	AudioStream *_bgSoundStream;
+	Audio::AudioStream *_bgSoundStream;
 
 #ifdef BACKEND_8BIT
 	int _palNum;
@@ -132,7 +134,7 @@ public:
 protected:
 	bool checkPaletteSwitch();
 	virtual void drawYUV(int width, int height, byte *const *dat) = 0;
-	virtual AudioStream *createAudioStream(const char *name, void *arg);
+	virtual Audio::AudioStream *createAudioStream(const char *name, void *arg);
 
 #ifdef BACKEND_8BIT
 	void buildLookup(int p, int lines);