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

svn-id: r18040

3 files changed, 5 insertions, 5 deletions

diff --git a/sword2/driver/animation.cpp b/sword2/driver/animation.cpp
index d70397eb4e..8e3e8958b6 100644
--- a/sword2/driver/animation.cpp
+++ b/sword2/driver/animation.cpp
@@ -168,7 +168,7 @@ void MoviePlayer::drawTextObject(AnimationState *anim, MovieTextObject *obj) {
  */
 
 int32 MoviePlayer::play(const char *filename, MovieTextObject *text[], int32 leadInRes, int32 leadOutRes) {
-	SoundHandle leadInHandle;
+	Audio::SoundHandle leadInHandle;
 
 	// This happens if the user quits during the "eye" smacker
 	if (_vm->_quit)
@@ -246,7 +246,7 @@ int32 MoviePlayer::play(const char *filename, MovieTextObject *text[], int32 lea
 
 void MoviePlayer::playMPEG(const char *filename, MovieTextObject *text[], byte *leadOut, uint32 leadOutLen) {
 	uint frameCounter = 0, textCounter = 0;
-	SoundHandle handle;
+	Audio::SoundHandle handle;
 	bool skipCutscene = false, textVisible = false;
 	uint32 flags = Audio::Mixer::FLAG_16BITS;
 	bool startNextText = false;
@@ -452,7 +452,7 @@ void MoviePlayer::playDummy(const char *filename, MovieTextObject *text[], byte
 	tmpPal[255 * 4 + 2] = 255;
 	_vm->_screen->setPalette(0, 256, tmpPal, RDPAL_INSTANT);
 
-	SoundHandle handle;
+	Audio::SoundHandle handle;
 
 	bool skipCutscene = false;
 
diff --git a/sword2/driver/animation.h b/sword2/driver/animation.h
index b2d0332281..5958d03692 100644
--- a/sword2/driver/animation.h
+++ b/sword2/driver/animation.h
@@ -78,7 +78,7 @@ private:
 
 	byte *_textSurface;
 
-	SoundHandle _leadOutHandle;
+	Audio::SoundHandle _leadOutHandle;
 
 	uint _leadOutFrame;
 	bool _seamless;
diff --git a/sword2/driver/d_sound.cpp b/sword2/driver/d_sound.cpp
index fd8e7e8671..33699972ef 100644
--- a/sword2/driver/d_sound.cpp
+++ b/sword2/driver/d_sound.cpp
@@ -441,7 +441,7 @@ int Sound::readBuffer(int16 *buffer, const int numSamples) {
 
 		if (!_musicMuted) {
 			for (int j = 0; j < len; j++) {
-				clampedAdd(buffer[j], _mixBuffer[j]);
+				Audio::clampedAdd(buffer[j], _mixBuffer[j]);
 			}
 		}
 	}