KYRA: sound files/classes reorganization step #5

Rename some sound classes to reflect the recent file renamings.

4 files changed, 8 insertions, 8 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