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

svn-id: r22231

3 files changed, 11 insertions, 11 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;
diff --git a/engines/saga/music.h b/engines/saga/music.h
index a276896dac..691deeea5e 100644
--- a/engines/saga/music.h
+++ b/engines/saga/music.h
@@ -137,7 +137,7 @@ private:
 	MidiParser *xmidiParser;
 	MidiParser *smfParser;
 
-	DigitalTrackInfo *_track;
+	Audio::DigitalTrackInfo *_track;
 
 	byte *_midiMusicData;
 
diff --git a/engines/saga/sndres.cpp b/engines/saga/sndres.cpp
index 40c6bd86a6..7849ddecd0 100644
--- a/engines/saga/sndres.cpp
+++ b/engines/saga/sndres.cpp
@@ -137,7 +137,7 @@ void SndRes::playVoice(uint32 resourceId) {
 
 bool SndRes::load(ResourceContext *context, uint32 resourceId, SoundBuffer &buffer, bool onlyHeader) {
 	byte *soundResource;
-	AudioStream *voxStream;
+	Audio::AudioStream *voxStream;
 	size_t soundResourceLength;
 	bool result = false;
 	GameSoundTypes resourceType;
@@ -217,7 +217,7 @@ bool SndRes::load(ResourceContext *context, uint32 resourceId, SoundBuffer &buff
 			buffer.buffer = NULL;
 			free(soundResource);
 		} else {
-			voxStream = makeADPCMStream(&readS, soundResourceLength, kADPCMOki);
+			voxStream = Audio::makeADPCMStream(&readS, soundResourceLength, Audio::kADPCMOki);
 			buffer.buffer = (byte *)malloc(buffer.size);
 			voxSize = voxStream->readBuffer((int16*)buffer.buffer, soundResourceLength * 2);
 			if (voxSize != soundResourceLength * 2) {
@@ -228,7 +228,7 @@ bool SndRes::load(ResourceContext *context, uint32 resourceId, SoundBuffer &buff
 		result = true;
 		break;
 	case kSoundVOC:
-		data = loadVOCFromStream(readS, size, rate);
+		data = Audio::loadVOCFromStream(readS, size, rate);
 		if (data) {
 			buffer.frequency = rate;
 			buffer.sampleBits = 8;
@@ -246,7 +246,7 @@ bool SndRes::load(ResourceContext *context, uint32 resourceId, SoundBuffer &buff
 		free(soundResource);
 		break;
 	case kSoundWAV:
-		if (loadWAVFromStream(readS, size, rate, flags)) {
+		if (Audio::loadWAVFromStream(readS, size, rate, flags)) {
 			buffer.frequency = rate;
 			buffer.sampleBits = 16;
 			buffer.stereo = ((flags & Audio::Mixer::FLAG_STEREO) != 0);