changing AudioDataType -> SoundType, so now the constant names match the name of the data type / the SoundMixer method names

svn-id: r17052

5 files changed, 19 insertions, 19 deletions

diff --git a/sword2/controls.cpp b/sword2/controls.cpp
index 5d80b8ca8c..8f42521696 100644
--- a/sword2/controls.cpp
+++ b/sword2/controls.cpp
@@ -945,9 +945,9 @@ OptionsDialog::OptionsDialog(Sword2Engine *vm) : Dialog(vm) {
 	_speechSwitch->setValue(!_vm->_sound->isSpeechMute());
 	_fxSwitch->setValue(!_vm->_sound->isFxMute());
 
-	_musicSlider->setValue(_mixer->getVolumeForSoundType(SoundMixer::kMusicAudioDataType));
-	_speechSlider->setValue(_mixer->getVolumeForSoundType(SoundMixer::kSpeechAudioDataType));
-	_fxSlider->setValue(_mixer->getVolumeForSoundType(SoundMixer::kSFXAudioDataType));
+	_musicSlider->setValue(_mixer->getVolumeForSoundType(SoundMixer::kMusicSoundType));
+	_speechSlider->setValue(_mixer->getVolumeForSoundType(SoundMixer::kSpeechSoundType));
+	_fxSlider->setValue(_mixer->getVolumeForSoundType(SoundMixer::kSFXSoundType));
 
 	_gfxSlider->setValue(_vm->_screen->getRenderLevel());
 	_gfxPreview->setState(_vm->_screen->getRenderLevel());
@@ -997,7 +997,7 @@ void OptionsDialog::onAction(Widget *widget, int result) {
 	if (widget == _musicSwitch) {
 		_vm->_sound->muteMusic(result != 0);
 	} else if (widget == _musicSlider) {
-		_vm->_mixer->setVolumeForSoundType(SoundMixer::kMusicAudioDataType, result);
+		_vm->_mixer->setVolumeForSoundType(SoundMixer::kMusicSoundType, result);
 		_vm->_sound->muteMusic(result == 0);
 		_musicSwitch->setValue(result != 0);
 	} else if (widget == _speechSlider) {
@@ -1015,9 +1015,9 @@ void OptionsDialog::onAction(Widget *widget, int result) {
 		_vm->_sound->muteSpeech(!_speechSwitch->getValue());
 		_vm->_sound->muteFx(!_fxSwitch->getValue());
 		_vm->_sound->setReverseStereo(_reverseStereoSwitch->getValue());
-		_mixer->setVolumeForSoundType(SoundMixer::kMusicAudioDataType, _musicSlider->getValue());
-		_mixer->setVolumeForSoundType(SoundMixer::kSpeechAudioDataType, _speechSlider->getValue());
-		_mixer->setVolumeForSoundType(SoundMixer::kSFXAudioDataType, _fxSlider->getValue());
+		_mixer->setVolumeForSoundType(SoundMixer::kMusicSoundType, _musicSlider->getValue());
+		_mixer->setVolumeForSoundType(SoundMixer::kSpeechSoundType, _speechSlider->getValue());
+		_mixer->setVolumeForSoundType(SoundMixer::kSFXSoundType, _fxSlider->getValue());
 		_vm->_screen->setRenderLevel(_gfxSlider->getValue());
 
 		_vm->writeSettings();
diff --git a/sword2/driver/animation.cpp b/sword2/driver/animation.cpp
index 6d9a7db779..2f428b144f 100644
--- a/sword2/driver/animation.cpp
+++ b/sword2/driver/animation.cpp
@@ -182,7 +182,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::kMusicAudioDataType);
+		_vm->_sound->playFx(&leadInHandle, leadIn, leadInLen, SoundMixer::kMaxChannelVolume, 0, false, SoundMixer::kMusicSoundType);
 	}
 
 	byte *leadOut = NULL;
@@ -301,7 +301,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::kMusicAudioDataType);
+			_vm->_sound->playFx(&_leadOutHandle, leadOut, leadOutLen, SoundMixer::kMaxChannelVolume, 0, false, SoundMixer::kMusicSoundType);
 
 		OSystem::Event event;
 		while (_sys->pollEvent(event)) {
@@ -516,7 +516,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::kMusicAudioDataType);
+		_vm->_sound->playFx(&_leadOutHandle, leadOut, leadOutLen, SoundMixer::kMaxChannelVolume, 0, false, SoundMixer::kMusicSoundType);
 
 	_vm->_screen->setPalette(0, 256, oldPal, RDPAL_INSTANT);
 }
diff --git a/sword2/driver/d_sound.cpp b/sword2/driver/d_sound.cpp
index 070cb15754..755aa1d73c 100644
--- a/sword2/driver/d_sound.cpp
+++ b/sword2/driver/d_sound.cpp
@@ -771,7 +771,7 @@ int32 Sound::playCompSpeech(uint32 speechId, uint8 vol, int8 pan) {
 		p = -p;
 
 	// Start the speech playing
-	_vm->_mixer->playInputStream(SoundMixer::kSpeechAudioDataType, &_soundHandleSpeech, input, -1, volume, p);
+	_vm->_mixer->playInputStream(SoundMixer::kSpeechSoundType, &_soundHandleSpeech, input, -1, volume, p);
 	return RD_OK;
 }
 
diff --git a/sword2/sound.cpp b/sword2/sound.cpp
index 7c64474bbd..9955eb5490 100644
--- a/sword2/sound.cpp
+++ b/sword2/sound.cpp
@@ -81,7 +81,7 @@ Sound::Sound(Sword2Engine *vm) {
 	_mixBuffer = NULL;
 	_mixBufferLen = 0;
 
-	_vm->_mixer->setupPremix(this, SoundMixer::kMusicAudioDataType);
+	_vm->_mixer->setupPremix(this, SoundMixer::kMusicSoundType);
 }
 
 Sound::~Sound() {
@@ -247,7 +247,7 @@ void Sound::queueFx(int32 res, int32 type, int32 delay, int32 volume, int32 pan)
 }
 
 int32 Sound::playFx(FxQueueEntry *fx) {
-	return playFx(&fx->handle, fx->data, fx->len, fx->volume, fx->pan, (fx->type == FX_LOOP), SoundMixer::kSFXAudioDataType);
+	return playFx(&fx->handle, fx->data, fx->len, fx->volume, fx->pan, (fx->type == FX_LOOP), SoundMixer::kSFXSoundType);
 }
 
 int32 Sound::playFx(PlayingSoundHandle *handle, byte *data, uint32 len, uint8 vol, int8 pan, bool loop, SoundMixer::SoundType soundType) {
diff --git a/sword2/sword2.cpp b/sword2/sword2.cpp
index 953d03b4cf..b77ddc60d1 100644
--- a/sword2/sword2.cpp
+++ b/sword2/sword2.cpp
@@ -188,9 +188,9 @@ void Sword2Engine::registerDefaultSettings() {
 }
 
 void Sword2Engine::readSettings() {
-	_mixer->setVolumeForSoundType(SoundMixer::kMusicAudioDataType, ConfMan.getInt("music_volume"));
-	_mixer->setVolumeForSoundType(SoundMixer::kSpeechAudioDataType, ConfMan.getInt("speech_volume"));
-	_mixer->setVolumeForSoundType(SoundMixer::kSFXAudioDataType, ConfMan.getInt("sfx_volume"));
+	_mixer->setVolumeForSoundType(SoundMixer::kMusicSoundType, ConfMan.getInt("music_volume"));
+	_mixer->setVolumeForSoundType(SoundMixer::kSpeechSoundType, ConfMan.getInt("speech_volume"));
+	_mixer->setVolumeForSoundType(SoundMixer::kSFXSoundType, ConfMan.getInt("sfx_volume"));
 	setSubtitles(ConfMan.getBool("subtitles"));
 	_sound->muteMusic(ConfMan.getBool("music_mute"));
 	_sound->muteSpeech(ConfMan.getBool("speech_mute"));
@@ -201,9 +201,9 @@ void Sword2Engine::readSettings() {
 }
 
 void Sword2Engine::writeSettings() {
-	ConfMan.set("music_volume", _mixer->getVolumeForSoundType(SoundMixer::kMusicAudioDataType));
-	ConfMan.set("speech_volume", _mixer->getVolumeForSoundType(SoundMixer::kSpeechAudioDataType));
-	ConfMan.set("sfx_volume", _mixer->getVolumeForSoundType(SoundMixer::kSFXAudioDataType));
+	ConfMan.set("music_volume", _mixer->getVolumeForSoundType(SoundMixer::kMusicSoundType));
+	ConfMan.set("speech_volume", _mixer->getVolumeForSoundType(SoundMixer::kSpeechSoundType));
+	ConfMan.set("sfx_volume", _mixer->getVolumeForSoundType(SoundMixer::kSFXSoundType));
 	ConfMan.set("music_mute", _sound->isMusicMute());
 	ConfMan.set("speech_mute", _sound->isSpeechMute());
 	ConfMan.set("sfx_mute", _sound->isFxMute());