3 files changed, 12 insertions, 12 deletions
diff --git a/sword2/driver/animation.cpp b/sword2/driver/animation.cpp
index 0d9c376ea1..d70397eb4e 100644
--- a/sword2/driver/animation.cpp
+++ b/sword2/driver/animation.cpp
@@ -183,7 +183,7 @@ int32 MoviePlayer::play(const char *filename, MovieTextObject *text[], int32 lea
 
 		leadIn += sizeof(StandardHeader);
 
-		_vm->_sound->playFx(&leadInHandle, leadIn, leadInLen, SoundMixer::kMaxChannelVolume, 0, false, SoundMixer::kMusicSoundType);
+		_vm->_sound->playFx(&leadInHandle, leadIn, leadInLen, Audio::Mixer::kMaxChannelVolume, 0, false, Audio::Mixer::kMusicSoundType);
 	}
 
 	byte *leadOut = NULL;
@@ -248,7 +248,7 @@ void MoviePlayer::playMPEG(const char *filename, MovieTextObject *text[], byte *
 	uint frameCounter = 0, textCounter = 0;
 	SoundHandle handle;
 	bool skipCutscene = false, textVisible = false;
-	uint32 flags = SoundMixer::FLAG_16BITS;
+	uint32 flags = Audio::Mixer::FLAG_16BITS;
 	bool startNextText = false;
 
 	byte oldPal[256 * 4];
@@ -271,7 +271,7 @@ void MoviePlayer::playMPEG(const char *filename, MovieTextObject *text[], byte *
 	_vm->_screen->updateDisplay();
 
 #ifndef SCUMM_BIG_ENDIAN
-	flags |= SoundMixer::FLAG_LITTLE_ENDIAN;
+	flags |= Audio::Mixer::FLAG_LITTLE_ENDIAN;
 #endif
 
 	while (!skipCutscene && anim->decodeFrame()) {
@@ -307,7 +307,7 @@ void MoviePlayer::playMPEG(const char *filename, MovieTextObject *text[], byte *
 		frameCounter++;
 
 		if (frameCounter == _leadOutFrame && leadOut)
-			_vm->_sound->playFx(&_leadOutHandle, leadOut, leadOutLen, SoundMixer::kMaxChannelVolume, 0, false, SoundMixer::kMusicSoundType);
+			_vm->_sound->playFx(&_leadOutHandle, leadOut, leadOutLen, Audio::Mixer::kMaxChannelVolume, 0, false, Audio::Mixer::kMusicSoundType);
 
 		OSystem::Event event;
 		while (_sys->pollEvent(event)) {
@@ -456,10 +456,10 @@ void MoviePlayer::playDummy(const char *filename, MovieTextObject *text[], byte
 
 	bool skipCutscene = false;
 
-	uint32 flags = SoundMixer::FLAG_16BITS;
+	uint32 flags = Audio::Mixer::FLAG_16BITS;
 
 #ifndef SCUMM_BIG_ENDIAN
-	flags |= SoundMixer::FLAG_LITTLE_ENDIAN;
+	flags |= Audio::Mixer::FLAG_LITTLE_ENDIAN;
 #endif
 
 	while (1) {
@@ -527,7 +527,7 @@ void MoviePlayer::playDummy(const char *filename, MovieTextObject *text[], byte
 	// subtitles.
 
 	if (!skipCutscene && leadOut)
-		_vm->_sound->playFx(&_leadOutHandle, leadOut, leadOutLen, SoundMixer::kMaxChannelVolume, 0, false, SoundMixer::kMusicSoundType);
+		_vm->_sound->playFx(&_leadOutHandle, leadOut, leadOutLen, Audio::Mixer::kMaxChannelVolume, 0, false, Audio::Mixer::kMusicSoundType);
 
 	_vm->_screen->setPalette(0, 256, oldPal, RDPAL_INSTANT);
 }
diff --git a/sword2/driver/animation.h b/sword2/driver/animation.h
index ae9495dc57..b2d0332281 100644
--- a/sword2/driver/animation.h
+++ b/sword2/driver/animation.h
@@ -73,7 +73,7 @@ struct MovieInfo {
 class MoviePlayer {
 private:
 	Sword2Engine *_vm;
-	SoundMixer *_snd;
+	Audio::Mixer *_snd;
 	OSystem *_sys;
 
 	byte *_textSurface;
diff --git a/sword2/driver/d_sound.cpp b/sword2/driver/d_sound.cpp
index 7a792417b6..fd8e7e8671 100644
--- a/sword2/driver/d_sound.cpp
+++ b/sword2/driver/d_sound.cpp
@@ -643,7 +643,7 @@ void Sound::muteSpeech(bool mute) {
 	_speechMuted = mute;
 
 	if (_vm->_mixer->isSoundHandleActive(_soundHandleSpeech)) {
-		uint volume = mute ? 0 : SoundMixer::kMaxChannelVolume;
+		uint volume = mute ? 0 : Audio::Mixer::kMaxChannelVolume;
 
 		_vm->_mixer->setChannelVolume(_soundHandleSpeech, volume);
 	}
@@ -764,14 +764,14 @@ int32 Sound::playCompSpeech(uint32 speechId, uint8 vol, int8 pan) {
 
 	// Modify the volume according to the master volume
 
-	byte volume = _speechMuted ? 0 : vol * SoundMixer::kMaxChannelVolume / 16;
+	byte volume = _speechMuted ? 0 : vol * Audio::Mixer::kMaxChannelVolume / 16;
 	int8 p = (pan * 127) / 16;
 
 	if (isReverseStereo())
 		p = -p;
 
 	// Start the speech playing
-	_vm->_mixer->playInputStream(SoundMixer::kSpeechSoundType, &_soundHandleSpeech, input, -1, volume, p);
+	_vm->_mixer->playInputStream(Audio::Mixer::kSpeechSoundType, &_soundHandleSpeech, input, -1, volume, p);
 	return RD_OK;
 }
 
@@ -810,7 +810,7 @@ int32 Sound::setFxIdVolumePan(int32 id, int vol, int pan) {
 	if (vol > 16)
 		vol = 16;
 
-	_fxQueue[id].volume = (vol * SoundMixer::kMaxChannelVolume) / 16;
+	_fxQueue[id].volume = (vol * Audio::Mixer::kMaxChannelVolume) / 16;
 
 	if (pan != 255) {
 		if (isReverseStereo())