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

svn-id: r22231

1 files changed, 6 insertions, 6 deletions

diff --git a/engines/saga/music.cpp b/engines/saga/music.cpp
index 52ebc51440..453ef05d4c 100644
--- a/engines/saga/music.cpp
+++ b/engines/saga/music.cpp
@@ -41,18 +41,18 @@ namespace Saga {
 #define BUFFER_SIZE 4096
 
 struct TrackFormat {
-	DigitalTrackInfo* (*openTrackFunction)(int);
+	Audio::DigitalTrackInfo* (*openTrackFunction)(int);
 };
 
 static const TrackFormat TRACK_FORMATS[] = {
 #ifdef USE_FLAC
-	{ getFlacTrack },
+	{ Audio::getFlacTrack },
 #endif
 #ifdef USE_VORBIS
-	{ getVorbisTrack },
+	{ Audio::getVorbisTrack },
 #endif
 #ifdef USE_MAD
-	{ getMP3Track },
+	{ Audio::getMP3Track },
 #endif
 
 	{ NULL } // Terminator
@@ -63,7 +63,7 @@ static const TrackFormat TRACK_FORMATS[] = {
 // Sword 2, to make it easier to add support for compressed music... but I'll
 // worry about that later.
 
-class RAWInputStream : public AudioStream {
+class RAWInputStream : public Audio::AudioStream {
 private:
 	ResourceContext *_context;
 	Common::File *_file;
@@ -374,7 +374,7 @@ bool Music::isPlaying() {
 }
 
 void Music::play(uint32 resourceId, MusicFlags flags) {
-	AudioStream *audioStream = NULL;
+	Audio::AudioStream *audioStream = NULL;
 	MidiParser *parser;
 	ResourceContext *context;
 	byte *resourceData;