KYRA: sound files/classes reorganization step #5

Rename some sound classes to reflect the recent file renamings.

10 files changed, 76 insertions, 76 deletions

diff --git a/engines/kyra/engine/kyra_lok.h b/engines/kyra/engine/kyra_lok.h
index 05053877c4..51654865c2 100644
--- a/engines/kyra/engine/kyra_lok.h
+++ b/engines/kyra/engine/kyra_lok.h
@@ -32,7 +32,7 @@
 namespace Kyra {
 
 class Movie;
-class SoundDigital;
+class SoundDigital_MR;
 class SeqPlayer;
 class Sprites;
 class Animator_LoK;
diff --git a/engines/kyra/engine/kyra_mr.cpp b/engines/kyra/engine/kyra_mr.cpp
index 4f87c53b27..b489b0fd7b 100644
--- a/engines/kyra/engine/kyra_mr.cpp
+++ b/engines/kyra/engine/kyra_mr.cpp
@@ -211,7 +211,7 @@ Common::Error KyraEngine_MR::init() {
 	KyraEngine_v1::init();
 	initStaticResource();
 
-	_soundDigital = new SoundDigital(this, _mixer);
+	_soundDigital = new SoundDigital_MR(this, _mixer);
 	assert(_soundDigital);
 	KyraEngine_v1::_text = _text = new TextDisplayer_MR(this, _screen);
 	assert(_text);
diff --git a/engines/kyra/engine/kyra_mr.h b/engines/kyra/engine/kyra_mr.h
index 83c97ebad9..e44303b470 100644
--- a/engines/kyra/engine/kyra_mr.h
+++ b/engines/kyra/engine/kyra_mr.h
@@ -33,7 +33,7 @@
 
 namespace Kyra {
 
-class SoundDigital;
+class SoundDigital_MR;
 class Screen_MR;
 class MainMenu;
 class WSAMovie_v2;
@@ -55,7 +55,7 @@ public:
 	Screen *screen() { return _screen; }
 	Screen_v2 *screen_v2() const { return _screen; }
 	GUI *gui() const { return _gui; }
-	SoundDigital *soundDigital() { return _soundDigital; }
+	SoundDigital_MR *soundDigital() { return _soundDigital; }
 	int language() const { return _lang; }
 	bool heliumMode() const { return _configHelium; }
 
@@ -80,7 +80,7 @@ private:
 
 	// --
 	Screen_MR *_screen;
-	SoundDigital *_soundDigital;
+	SoundDigital_MR *_soundDigital;
 
 	Common::Error init();
 
diff --git a/engines/kyra/engine/kyra_v1.cpp b/engines/kyra/engine/kyra_v1.cpp
index e2896eb1a5..7b93851d8f 100644
--- a/engines/kyra/engine/kyra_v1.cpp
+++ b/engines/kyra/engine/kyra_v1.cpp
@@ -99,16 +99,16 @@ Common::Error KyraEngine_v1::init() {
 	if (!_flags.useDigSound) {
 		if (_flags.platform == Common::kPlatformFMTowns) {
 			if (_flags.gameID == GI_KYRA1)
-				_sound = new SoundTowns(this, _mixer);
+				_sound = new SoundTowns_LoK(this, _mixer);
 			else
 				_sound = new SoundTownsPC98_v2(this, _mixer);
 		} else if (_flags.platform == Common::kPlatformPC98) {
 			if (_flags.gameID == GI_KYRA1)
-				_sound = new SoundPC98(this, _mixer);
+				_sound = new SoundPC98_LoK(this, _mixer);
 			else
 				_sound = new SoundTownsPC98_v2(this, _mixer);
 		} else if (_flags.platform == Common::kPlatformAmiga) {
-			_sound = new SoundAmiga(this, _mixer);
+			_sound = new SoundAmiga_LoK(this, _mixer);
 		} else {
 			// In Kyra 1 users who have specified a default MT-32 device in the launcher settings
 			// will get MT-32 music, otherwise AdLib. In Kyra 2 and LoL users who have specified a
diff --git a/engines/kyra/sound/sound_amiga_lok.cpp b/engines/kyra/sound/sound_amiga_lok.cpp
index 110400415f..5edea54f3a 100644
--- a/engines/kyra/sound/sound_amiga_lok.cpp
+++ b/engines/kyra/sound/sound_amiga_lok.cpp
@@ -28,7 +28,7 @@
 
 namespace Kyra {
 
-SoundAmiga::SoundAmiga(KyraEngine_v1 *vm, Audio::Mixer *mixer)
+SoundAmiga_LoK::SoundAmiga_LoK(KyraEngine_v1 *vm, Audio::Mixer *mixer)
 	: Sound(vm, mixer),
 	  _driver(0),
 	  _musicHandle(),
@@ -39,12 +39,12 @@ SoundAmiga::SoundAmiga(KyraEngine_v1 *vm, Audio::Mixer *mixer)
 	  _tableSfxGame_Size(0) {
 }
 
-SoundAmiga::~SoundAmiga() {
+SoundAmiga_LoK::~SoundAmiga_LoK() {
 	_mixer->stopHandle(_musicHandle);
 	delete _driver;
 }
 
-bool SoundAmiga::init() {
+bool SoundAmiga_LoK::init() {
 	_driver = new Audio::MaxTrax(_mixer->getOutputRate(), true);
 
 	_tableSfxIntro = _vm->staticres()->loadAmigaSfxTable(k1AmigaIntroSFXTable, _tableSfxIntro_Size);
@@ -53,24 +53,24 @@ bool SoundAmiga::init() {
 	return _driver != 0 && _tableSfxIntro && _tableSfxGame;
 }
 
-void SoundAmiga::initAudioResourceInfo(int set, void *info) {
+void SoundAmiga_LoK::initAudioResourceInfo(int set, void *info) {
 	// See comment below
 }
 
-void SoundAmiga::selectAudioResourceSet(int set) {
+void SoundAmiga_LoK::selectAudioResourceSet(int set) {
 	// It seems that loadSoundFile() is doing what would normally be done in here.
 	// As long as this driver is only required for one single target (Kyra 1 Amiga)
 	// this doesn't matter much.
 }
 
-bool SoundAmiga::hasSoundFile(uint file) const {
+bool SoundAmiga_LoK::hasSoundFile(uint file) const {
 	if (file < 3)
 		return true;
 	return false;
 }
 
-void SoundAmiga::loadSoundFile(uint file) {
-	debugC(5, kDebugLevelSound, "SoundAmiga::loadSoundFile(%d)", file);
+void SoundAmiga_LoK::loadSoundFile(uint file) {
+	debugC(5, kDebugLevelSound, "SoundAmiga_LoK::loadSoundFile(%d)", file);
 
 	static const char *const tableFilenames[3][2] = {
 		{ "introscr.mx",  "introinst.mx" },
@@ -92,14 +92,14 @@ void SoundAmiga::loadSoundFile(uint file) {
 			loaded = _driver->load(*scoreIn, true, false);
 			loaded = loaded && _driver->load(*sampleIn, false, true);
 		} else
-			warning("SoundAmiga: missing atleast one of those music files: %s, %s", scoreName, sampleName);
+			warning("SoundAmiga_LoK: missing atleast one of those music files: %s, %s", scoreName, sampleName);
 		delete sampleIn;
 	} else {
 		if (scoreIn) {
 			_fileLoaded = kFileNone;
 			loaded = _driver->load(*scoreIn);
 		} else
-			warning("SoundAmiga: missing music file: %s", scoreName);
+			warning("SoundAmiga_LoK: missing music file: %s", scoreName);
 	}
 	delete scoreIn;
 
@@ -107,8 +107,8 @@ void SoundAmiga::loadSoundFile(uint file) {
 		_fileLoaded = (FileType)file;
 }
 
-void SoundAmiga::playTrack(uint8 track) {
-	debugC(5, kDebugLevelSound, "SoundAmiga::playTrack(%d)", track);
+void SoundAmiga_LoK::playTrack(uint8 track) {
+	debugC(5, kDebugLevelSound, "SoundAmiga_LoK::playTrack(%d)", track);
 
 	static const byte tempoIntro[] = { 0x46, 0x55, 0x3C, 0x41 };
 	static const byte tempoFinal[] = { 0x78, 0x50 };
@@ -172,13 +172,13 @@ void SoundAmiga::playTrack(uint8 track) {
 		beginFadeOut();
 }
 
-void SoundAmiga::haltTrack() {
-	debugC(5, kDebugLevelSound, "SoundAmiga::haltTrack()");
+void SoundAmiga_LoK::haltTrack() {
+	debugC(5, kDebugLevelSound, "SoundAmiga_LoK::haltTrack()");
 	_driver->stopMusic();
 }
 
-void SoundAmiga::beginFadeOut() {
-	debugC(5, kDebugLevelSound, "SoundAmiga::beginFadeOut()");
+void SoundAmiga_LoK::beginFadeOut() {
+	debugC(5, kDebugLevelSound, "SoundAmiga_LoK::beginFadeOut()");
 	for (int i = 0x3F; i >= 0; --i) {
 		_driver->setVolume((byte)i);
 		_vm->delay(_vm->tickLength());
@@ -189,8 +189,8 @@ void SoundAmiga::beginFadeOut() {
 	_driver->setVolume(0x40);
 }
 
-void SoundAmiga::playSoundEffect(uint8 track, uint8) {
-	debugC(5, kDebugLevelSound, "SoundAmiga::playSoundEffect(%d)", track);
+void SoundAmiga_LoK::playSoundEffect(uint8 track, uint8) {
+	debugC(5, kDebugLevelSound, "SoundAmiga_LoK::playSoundEffect(%d)", track);
 	const AmigaSfxTable *sfx = 0;
 	bool pan = false;
 
diff --git a/engines/kyra/sound/sound_digital_mr.cpp b/engines/kyra/sound/sound_digital_mr.cpp
index ffcfcd128d..79791a6639 100644
--- a/engines/kyra/sound/sound_digital_mr.cpp
+++ b/engines/kyra/sound/sound_digital_mr.cpp
@@ -102,17 +102,17 @@ int KyraAudioStream::readBuffer(int16 *buffer, const int numSamples) {
 	return samplesRead;
 }
 
-SoundDigital::SoundDigital(KyraEngine_MR *vm, Audio::Mixer *mixer) : _vm(vm), _mixer(mixer) {
+SoundDigital_MR::SoundDigital_MR(KyraEngine_MR *vm, Audio::Mixer *mixer) : _vm(vm), _mixer(mixer) {
 	for (uint i = 0; i < ARRAYSIZE(_sounds); ++i)
 		_sounds[i].stream = 0;
 }
 
-SoundDigital::~SoundDigital() {
+SoundDigital_MR::~SoundDigital_MR() {
 	for (int i = 0; i < ARRAYSIZE(_sounds); ++i)
 		stopSound(i);
 }
 
-int SoundDigital::playSound(const char *filename, uint8 priority, Audio::Mixer::SoundType type, int volume, bool loop, int channel) {
+int SoundDigital_MR::playSound(const char *filename, uint8 priority, Audio::Mixer::SoundType type, int volume, bool loop, int channel) {
 	Sound *use = 0;
 	if (channel != -1 && channel < ARRAYSIZE(_sounds)) {
 		stopSound(channel);
@@ -194,7 +194,7 @@ int SoundDigital::playSound(const char *filename, uint8 priority, Audio::Mixer::
 	return use - _sounds;
 }
 
-bool SoundDigital::isPlaying(int channel) {
+bool SoundDigital_MR::isPlaying(int channel) {
 	if (channel == -1)
 		return false;
 
@@ -206,7 +206,7 @@ bool SoundDigital::isPlaying(int channel) {
 	return _mixer->isSoundHandleActive(_sounds[channel].handle);
 }
 
-void SoundDigital::stopSound(int channel) {
+void SoundDigital_MR::stopSound(int channel) {
 	if (channel == -1)
 		return;
 
@@ -215,14 +215,14 @@ void SoundDigital::stopSound(int channel) {
 	_sounds[channel].stream = 0;
 }
 
-void SoundDigital::stopAllSounds() {
+void SoundDigital_MR::stopAllSounds() {
 	for (int i = 0; i < ARRAYSIZE(_sounds); ++i) {
 		if (isPlaying(i))
 			stopSound(i);
 	}
 }
 
-void SoundDigital::beginFadeOut(int channel, int ticks) {
+void SoundDigital_MR::beginFadeOut(int channel, int ticks) {
 	if (isPlaying(channel))
 		_sounds[channel].stream->beginFadeOut(ticks * _vm->tickLength());
 }
@@ -231,7 +231,7 @@ void SoundDigital::beginFadeOut(int channel, int ticks) {
 
 Audio::SeekableAudioStream *makeAUDStream(Common::SeekableReadStream *stream, DisposeAfterUse::Flag disposeAfterUse);
 
-const SoundDigital::AudioCodecs SoundDigital::_supportedCodecs[] = {
+const SoundDigital_MR::AudioCodecs SoundDigital_MR::_supportedCodecs[] = {
 #ifdef USE_FLAC
 	{ ".FLA", Audio::makeFLACStream },
 #endif // USE_FLAC
diff --git a/engines/kyra/sound/sound_digital_mr.h b/engines/kyra/sound/sound_digital_mr.h
index 1aece2da07..b41929d2c3 100644
--- a/engines/kyra/sound/sound_digital_mr.h
+++ b/engines/kyra/sound/sound_digital_mr.h
@@ -44,10 +44,10 @@ class KyraEngine_MR;
  *
  * This is just used for Kyrandia 3.
  */
-class SoundDigital {
+class SoundDigital_MR {
 public:
-	SoundDigital(KyraEngine_MR *vm, Audio::Mixer *mixer);
-	~SoundDigital();
+	SoundDigital_MR(KyraEngine_MR *vm, Audio::Mixer *mixer);
+	~SoundDigital_MR();
 
 	/**
 	 * Plays a sound.
diff --git a/engines/kyra/sound/sound_intern.h b/engines/kyra/sound/sound_intern.h
index 4820133d16..8d76a80db6 100644
--- a/engines/kyra/sound/sound_intern.h
+++ b/engines/kyra/sound/sound_intern.h
@@ -110,10 +110,10 @@ private:
 	Common::Mutex _mutex;
 };
 
-class SoundTowns : public Sound {
+class SoundTowns_LoK : public Sound {
 public:
-	SoundTowns(KyraEngine_v1 *vm, Audio::Mixer *mixer);
-	virtual ~SoundTowns();
+	SoundTowns_LoK(KyraEngine_v1 *vm, Audio::Mixer *mixer);
+	virtual ~SoundTowns_LoK();
 
 	virtual kType getMusicType() const { return kTowns; }
 
@@ -164,10 +164,10 @@ private:
 	const uint8 *_sfxWDTable;
 };
 
-class SoundPC98 : public Sound {
+class SoundPC98_LoK : public Sound {
 public:
-	SoundPC98(KyraEngine_v1 *vm, Audio::Mixer *mixer);
-	virtual ~SoundPC98();
+	SoundPC98_LoK(KyraEngine_v1 *vm, Audio::Mixer *mixer);
+	virtual ~SoundPC98_LoK();
 
 	virtual kType getMusicType() const override { return kPC98; }
 
@@ -315,10 +315,10 @@ struct AmigaSfxTable {
 	uint8 pan;
 };
 
-class SoundAmiga : public Sound {
+class SoundAmiga_LoK : public Sound {
 public:
-	SoundAmiga(KyraEngine_v1 *vm, Audio::Mixer *mixer);
-	virtual ~SoundAmiga();
+	SoundAmiga_LoK(KyraEngine_v1 *vm, Audio::Mixer *mixer);
+	virtual ~SoundAmiga_LoK();
 
 	virtual kType getMusicType() const override { return kAmiga; } //FIXME
 
diff --git a/engines/kyra/sound/sound_pc98_lok.cpp b/engines/kyra/sound/sound_pc98_lok.cpp
index 38a9a5646d..8695fc5e35 100644
--- a/engines/kyra/sound/sound_pc98_lok.cpp
+++ b/engines/kyra/sound/sound_pc98_lok.cpp
@@ -29,12 +29,12 @@
 
 namespace Kyra {
 
-SoundPC98::SoundPC98(KyraEngine_v1 *vm, Audio::Mixer *mixer) :
+SoundPC98_LoK::SoundPC98_LoK(KyraEngine_v1 *vm, Audio::Mixer *mixer) :
 	Sound(vm, mixer), _musicTrackData(0), _sfxTrackData(0), _lastTrack(-1), _driver(0), _currentResourceSet(0) {
 	memset(&_resInfo, 0, sizeof(_resInfo));
 }
 
-SoundPC98::~SoundPC98() {
+SoundPC98_LoK::~SoundPC98_LoK() {
 	delete[] _musicTrackData;
 	delete[] _sfxTrackData;
 	delete _driver;
@@ -42,7 +42,7 @@ SoundPC98::~SoundPC98() {
 		initAudioResourceInfo(i, 0);
 }
 
-bool SoundPC98::init() {
+bool SoundPC98_LoK::init() {
 	_driver = new TownsPC98_AudioDriver(_mixer, TownsPC98_AudioDriver::kType26);
 	bool reslt = _driver->init();
 	updateVolumeSettings();
@@ -50,25 +50,25 @@ bool SoundPC98::init() {
 	return reslt;
 }
 
-void SoundPC98::initAudioResourceInfo(int set, void *info) {
+void SoundPC98_LoK::initAudioResourceInfo(int set, void *info) {
 	if (set >= kMusicIntro && set <= kMusicFinale) {
 		delete _resInfo[set];
 		_resInfo[set] = info ? new Common::String(((SoundResourceInfo_PC98*)info)->pattern) : 0;
 	}
 }
 
-void SoundPC98::selectAudioResourceSet(int set) {
+void SoundPC98_LoK::selectAudioResourceSet(int set) {
 	if (set >= kMusicIntro && set <= kMusicFinale) {
 		if (_resInfo[set])
 			_currentResourceSet = set;
 	}
 }
 
-bool SoundPC98::hasSoundFile(uint file) const {
+bool SoundPC98_LoK::hasSoundFile(uint file) const {
 	return true;
 }
 
-void SoundPC98::loadSoundFile(uint) {
+void SoundPC98_LoK::loadSoundFile(uint) {
 	if (_currentResourceSet == kMusicIntro) {
 		delete[] _sfxTrackData;
 		_sfxTrackData = 0;
@@ -86,12 +86,12 @@ void SoundPC98::loadSoundFile(uint) {
 	}
 }
 
-void SoundPC98::loadSoundFile(Common::String file) {
+void SoundPC98_LoK::loadSoundFile(Common::String file) {
 	delete[] _sfxTrackData;
 	_sfxTrackData = _vm->resource()->fileData(file.c_str(), 0);
 }
 
-void SoundPC98::playTrack(uint8 track) {
+void SoundPC98_LoK::playTrack(uint8 track) {
 	track -= 1;
 
 	if (track == _lastTrack && _musicEnabled)
@@ -108,12 +108,12 @@ void SoundPC98::playTrack(uint8 track) {
 	_lastTrack = track;
 }
 
-void SoundPC98::haltTrack() {
+void SoundPC98_LoK::haltTrack() {
 	_lastTrack = -1;
 	_driver->reset();
 }
 
-void SoundPC98::beginFadeOut() {
+void SoundPC98_LoK::beginFadeOut() {
 	if (!_driver->musicPlaying())
 		return;
 
@@ -124,14 +124,14 @@ void SoundPC98::beginFadeOut() {
 	haltTrack();
 }
 
-void SoundPC98::playSoundEffect(uint8 track, uint8) {
+void SoundPC98_LoK::playSoundEffect(uint8 track, uint8) {
 	if (!_sfxTrackData)
 		return;
 
 	_driver->loadSoundEffectData(_sfxTrackData, track);
 }
 
-void SoundPC98::updateVolumeSettings() {
+void SoundPC98_LoK::updateVolumeSettings() {
 	if (!_driver)
 		return;
 
diff --git a/engines/kyra/sound/sound_towns_lok.cpp b/engines/kyra/sound/sound_towns_lok.cpp
index 6a22f5f154..d66b649907 100644
--- a/engines/kyra/sound/sound_towns_lok.cpp
+++ b/engines/kyra/sound/sound_towns_lok.cpp
@@ -31,14 +31,14 @@
 
 namespace Kyra {
 
-SoundTowns::SoundTowns(KyraEngine_v1 *vm, Audio::Mixer *mixer)
+SoundTowns_LoK::SoundTowns_LoK(KyraEngine_v1 *vm, Audio::Mixer *mixer)
 	: Sound(vm, mixer), _lastTrack(-1), _musicTrackData(0), _sfxFileData(0), _cdaPlaying(0),
 	_sfxFileIndex((uint)-1), _musicFadeTable(0), _sfxWDTable(0), _sfxBTTable(0), _sfxChannel(0x46), _currentResourceSet(0) {
 	memset(&_resInfo, 0, sizeof(_resInfo));
 	_player = new EuphonyPlayer(_mixer);
 }
 
-SoundTowns::~SoundTowns() {
+SoundTowns_LoK::~SoundTowns_LoK() {
 	g_system->getAudioCDManager()->stop();
 	haltTrack();
 	delete _player;
@@ -48,7 +48,7 @@ SoundTowns::~SoundTowns() {
 		initAudioResourceInfo(i, 0);
 }
 
-bool SoundTowns::init() {
+bool SoundTowns_LoK::init() {
 	_vm->checkCD();
 	int unused = 0;
 	_musicFadeTable = _vm->staticres()->loadRawData(k1TownsMusicFadeTable, unused);
@@ -72,11 +72,11 @@ bool SoundTowns::init() {
 	return true;
 }
 
-void SoundTowns::process() {
+void SoundTowns_LoK::process() {
 	g_system->getAudioCDManager()->update();
 }
 
-void SoundTowns::playTrack(uint8 track) {
+void SoundTowns_LoK::playTrack(uint8 track) {
 	if (track < 2)
 		return;
 	track -= 2;
@@ -106,7 +106,7 @@ void SoundTowns::playTrack(uint8 track) {
 	_lastTrack = track;
 }
 
-void SoundTowns::haltTrack() {
+void SoundTowns_LoK::haltTrack() {
 	_lastTrack = -1;
 	g_system->getAudioCDManager()->stop();
 	g_system->getAudioCDManager()->update();
@@ -121,27 +121,27 @@ void SoundTowns::haltTrack() {
 	_player->stop();
 }
 
-void SoundTowns::initAudioResourceInfo(int set, void *info) {
+void SoundTowns_LoK::initAudioResourceInfo(int set, void *info) {
 	if (set >= kMusicIntro && set <= kMusicFinale) {
 		delete _resInfo[set];
 		_resInfo[set] = info ? new SoundResourceInfo_Towns(*(SoundResourceInfo_Towns*)info) : 0;
 	}
 }
 
-void SoundTowns::selectAudioResourceSet(int set) {
+void SoundTowns_LoK::selectAudioResourceSet(int set) {
 	if (set >= kMusicIntro && set <= kMusicFinale) {
 		if (_resInfo[set])
 			_currentResourceSet = set;
 	}
 }
 
-bool SoundTowns::hasSoundFile(uint file) const {
+bool SoundTowns_LoK::hasSoundFile(uint file) const {
 	if (file < res()->fileListSize)
 		return (res()->fileList[file] != 0);
 	return false;
 }
 
-void SoundTowns::loadSoundFile(uint file) {
+void SoundTowns_LoK::loadSoundFile(uint file) {
 	if (_sfxFileIndex == file || file >= res()->fileListSize)
 		return;
 	_sfxFileIndex = file;
@@ -149,7 +149,7 @@ void SoundTowns::loadSoundFile(uint file) {
 	_sfxFileData = _vm->resource()->fileData(res()->fileList[file], 0);
 }
 
-void SoundTowns::playSoundEffect(uint8 track, uint8) {
+void SoundTowns_LoK::playSoundEffect(uint8 track, uint8) {
 	if (!_sfxEnabled || !_sfxFileData)
 		return;
 
@@ -229,7 +229,7 @@ void SoundTowns::playSoundEffect(uint8 track, uint8) {
 	delete[] sfxPlaybackBuffer;
 }
 
-void SoundTowns::updateVolumeSettings() {
+void SoundTowns_LoK::updateVolumeSettings() {
 	if (!_player)
 		return;
 
@@ -241,7 +241,7 @@ void SoundTowns::updateVolumeSettings() {
 	_player->driver()->setSoundEffectVolume((mute ? 0 : ConfMan.getInt("sfx_volume")));
 }
 
-void SoundTowns::stopAllSoundEffects() {
+void SoundTowns_LoK::stopAllSoundEffects() {
 	_player->driver()->channelVolume(0x46, 0);
 	_player->driver()->channelVolume(0x47, 0);
 	_player->driver()->stopSoundEffect(0x46);
@@ -249,7 +249,7 @@ void SoundTowns::stopAllSoundEffects() {
 	_sfxChannel = 0x46;
 }
 
-void SoundTowns::beginFadeOut() {
+void SoundTowns_LoK::beginFadeOut() {
 	if (_cdaPlaying) {
 		for (int i = 118; i > 103; i--) {
 			_player->driver()->setOutputVolume(1, i, i);
@@ -316,7 +316,7 @@ void SoundTowns::beginFadeOut() {
 	haltTrack();
 }
 
-bool SoundTowns::loadInstruments() {
+bool SoundTowns_LoK::loadInstruments() {
 	uint8 *twm = _vm->resource()->fileData("twmusic.pak", 0);
 	if (!twm)
 		return false;
@@ -343,7 +343,7 @@ bool SoundTowns::loadInstruments() {
 	return true;
 }
 
-void SoundTowns::playEuphonyTrack(uint32 offset, int loop) {
+void SoundTowns_LoK::playEuphonyTrack(uint32 offset, int loop) {
 	uint8 *twm = _vm->resource()->fileData("twmusic.pak", 0);
 	Screen::decodeFrame4(twm + 19312 + offset, _musicTrackData, 50570);
 	delete[] twm;
@@ -381,7 +381,7 @@ void SoundTowns::playEuphonyTrack(uint32 offset, int loop) {
 	_player->startTrack(src, trackSize, startTick);
 }
 
-void SoundTowns::fadeOutSoundEffects() {
+void SoundTowns_LoK::fadeOutSoundEffects() {
 	for (int i = 127; i > 0; i-= 12) {
 		_player->driver()->channelVolume(0x46, i);
 		_player->driver()->channelVolume(0x47, i);