Moved some more stuff to namespace Audio (enough for tonight)

svn-id: r18040

3 files changed, 5 insertions, 5 deletions

diff --git a/saga/music.h b/saga/music.h
index 9fcd66558d..9d9701397f 100644
--- a/saga/music.h
+++ b/saga/music.h
@@ -125,7 +125,7 @@ private:
 	Audio::Mixer *_mixer;
 
 	MusicPlayer *_player;
-	SoundHandle _musicHandle;
+	Audio::SoundHandle _musicHandle;
 	uint32 _trackNumber;
 
 	static const MUSIC_MIDITABLE _midiTableITECD[26];
diff --git a/saga/sound.cpp b/saga/sound.cpp
index ae1a14cf04..4bff16e762 100644
--- a/saga/sound.cpp
+++ b/saga/sound.cpp
@@ -46,7 +46,7 @@ Sound::~Sound() {
 	_soundInitialized = 0;
 }
 
-int Sound::playSoundBuffer(SoundHandle *handle, SOUNDBUFFER *buf, int volume, bool loop) {
+int Sound::playSoundBuffer(Audio::SoundHandle *handle, SOUNDBUFFER *buf, int volume, bool loop) {
 	byte flags;
 
 	if (!_soundInitialized) {
diff --git a/saga/sound.h b/saga/sound.h
index 4bf126edcf..a22dd79b3e 100644
--- a/saga/sound.h
+++ b/saga/sound.h
@@ -64,7 +64,7 @@ public:
 
  private:
 
-	int playSoundBuffer(SoundHandle *handle, SOUNDBUFFER *buf, int volume, bool loop);
+	int playSoundBuffer(Audio::SoundHandle *handle, SOUNDBUFFER *buf, int volume, bool loop);
 
 	int _soundInitialized;
 	int _enabled;
@@ -73,8 +73,8 @@ public:
 	Audio::Mixer *_mixer;
 	Common::MemoryReadStream *_voxStream;
 
-	SoundHandle _effectHandle;
-	SoundHandle _voiceHandle;
+	Audio::SoundHandle _effectHandle;
+	Audio::SoundHandle _voiceHandle;
 
 };