XEEN: Refactor to merge Sound and Music classes

The existing structure didn't make sense, as Sound only handled
sound files, but Music handled both music and short FX decoding.
I've merged Sound & MUsic into a single Sound class, and moved
the music driver to their own file, renamed to SoundDriver

4 files changed, 26 insertions, 26 deletions

diff --git a/engines/xeen/worldofxeen/clouds_cutscenes.cpp b/engines/xeen/worldofxeen/clouds_cutscenes.cpp
index 3dc40c2a5d..c58286449e 100644
--- a/engines/xeen/worldofxeen/clouds_cutscenes.cpp
+++ b/engines/xeen/worldofxeen/clouds_cutscenes.cpp
@@ -242,7 +242,7 @@ bool CloudsCutscenes::showCloudsIntro() {
 			sound.playSound(_INTRO_VOCS[lineCtr]);
 		}
 
-		for (int frameCtr = 0, lookup = 0; sound.isPlaying() || _subtitleSize; ) {
+		for (int frameCtr = 0, lookup = 0; sound.isSoundPlaying() || _subtitleSize; ) {
 			groupo.draw(0, 0);
 			groupo.draw(0, 1, Common::Point(160, 0));
 
@@ -315,7 +315,7 @@ bool CloudsCutscenes::showCloudsIntro() {
 
 			events.updateGameCounter();
 			while (events.timeElapsed() < _INTRO_FRAMES_WAIT[_INTRO_FRAMES_LOOKUP[lineCtr]][lookup]
-					&& sound.isPlaying()) {
+					&& sound.isSoundPlaying()) {
 				events.pollEventsAndWait();
 				if (events.isKeyMousePressed())
 					return false;
@@ -436,7 +436,7 @@ bool CloudsCutscenes::showCloudsEnding1() {
 	bool flag = false;
 	for (int idx1 = 1; idx1 < 7; ++idx1) {
 		for (int idx2 = 0; idx2 < COUNTS1[idx1 - 1]; ++idx2) {
-			if (flag && !sound.isPlaying()) {
+			if (flag && !sound.isSoundPlaying()) {
 				flag = false;
 				sound.playFX(34);
 			} else if (!flag && idx1 == 1 && idx2 == 6) {
@@ -541,7 +541,7 @@ bool CloudsCutscenes::showCloudsEnding1() {
 
 			showSubtitles(0);
 			WAIT(3);
-		} while (sound.isPlaying() || _subtitleSize > 0);
+		} while (sound.isSoundPlaying() || _subtitleSize > 0);
 	}
 
 	// Laugh
@@ -663,7 +663,7 @@ bool CloudsCutscenes::showCloudsEnding2() {
 
 			showSubtitles();
 			WAIT(3);
-		} while (sound.isPlaying() || _subtitleSize);
+		} while (sound.isSoundPlaying() || _subtitleSize);
 
 		king.draw(0, 0, Common::Point(0, 0));
 		king.draw(0, 1, Common::Point(160, 0));
@@ -946,7 +946,7 @@ bool CloudsCutscenes::showCloudsEnding5() {
 
 		showSubtitles();
 		WAIT(3);
-	} while (sound.isPlaying() || _subtitleSize);
+	} while (sound.isSoundPlaying() || _subtitleSize);
 
 	king.draw(0, 0, Common::Point(0, 0));
 	king.draw(0, 1, Common::Point(160, 0));
diff --git a/engines/xeen/worldofxeen/darkside_cutscenes.cpp b/engines/xeen/worldofxeen/darkside_cutscenes.cpp
index a08b0c1ed7..a772500eaa 100644
--- a/engines/xeen/worldofxeen/darkside_cutscenes.cpp
+++ b/engines/xeen/worldofxeen/darkside_cutscenes.cpp
@@ -245,7 +245,7 @@ bool DarkSideCutscenes::showDarkSideIntro() {
 		pyramid.draw(0, idx, Common::Point(132, 62));
 		showSubtitles();
 
-		if (!sound.isPlaying() && !phar2)
+		if (!sound.isSoundPlaying() && !phar2)
 			sound.playSound("pharoh1b.voc");
 
 		events.updateGameCounter();
@@ -303,11 +303,11 @@ bool DarkSideCutscenes::showDarkSideIntro() {
 
 		if (idx == SCREEN_WIDTH)
 			sound.playSound(PHAR2_VOC[0]);
-		if (!sound.isPlaying() && phar2Index < 4)
+		if (!sound.isSoundPlaying() && phar2Index < 4)
 			sound.playSound(PHAR2_VOC[1 + phar2Index++]);
 
 		if (phar2Index == 4) {
-			if (!sound.isPlaying() && !_subtitleSize)
+			if (!sound.isSoundPlaying() && !_subtitleSize)
 				break;
 		}
 
@@ -464,7 +464,7 @@ bool DarkSideCutscenes::showDarkSideEnding1() {
 	// Play landing thud
 	sound.playSound("thud.voc");
 	while (!_vm->shouldExit() && !events.isKeyMousePressed()
-		&& sound.isPlaying()) {
+		&& sound.isSoundPlaying()) {
 		events.pollEventsAndWait();
 	}
 
@@ -585,7 +585,7 @@ bool DarkSideCutscenes::showDarkSideEnding2() {
 			sound.playSound("yes1.voc");
 
 		// Animate Corak speaking
-		sc08.draw(0, sound.isPlaying() ? getSpeakingFrame(0, 2) : 0);
+		sc08.draw(0, sound.isSoundPlaying() ? getSpeakingFrame(0, 2) : 0);
 		showSubtitles();
 		WAIT(3);
 	}
@@ -938,7 +938,7 @@ bool DarkSideCutscenes::showDarkSideEnding3() {
 	screen.saveBackground();
 	screen.horizMerge(SCREEN_WIDTH);
 
-	while (sound.isPlaying()) {
+	while (sound.isSoundPlaying()) {
 		WAIT(1);
 	}
 
@@ -1072,7 +1072,7 @@ bool DarkSideCutscenes::showDarkSideEnding4() {
 	showSubtitles();
 	sound.playSound("ido2.voc");
 
-	for (int idx = 0; sound.isPlaying() || _subtitleSize; ) {
+	for (int idx = 0; sound.isSoundPlaying() || _subtitleSize; ) {
 		screen.restoreBackground();
 		sc26[idx / 8].draw(0, idx % 8, Common::Point(58, 25));
 		WAIT(2);
@@ -1083,7 +1083,7 @@ bool DarkSideCutscenes::showDarkSideEnding4() {
 	screen.loadBackground("sc270001.raw");
 	screen.saveBackground();
 
-	while (sound.isPlaying() && !_vm->shouldExit()) {
+	while (sound.isSoundPlaying() && !_vm->shouldExit()) {
 		events.pollEventsAndWait();
 		if (events.isKeyMousePressed())
 			return false;
diff --git a/engines/xeen/worldofxeen/worldofxeen.cpp b/engines/xeen/worldofxeen/worldofxeen.cpp
index e1e397ff46..cb2c8c7ee3 100644
--- a/engines/xeen/worldofxeen/worldofxeen.cpp
+++ b/engines/xeen/worldofxeen/worldofxeen.cpp
@@ -162,7 +162,7 @@ void WorldOfXeenEngine::death() {
 			}
 		}
 
-		if (!_sound->isPlaying())
+		if (!_sound->isSoundPlaying())
 			idx = 23;
 	}
 
@@ -187,11 +187,11 @@ void WorldOfXeenEngine::dream() {
 		_events->pollEventsAndWait();
 
 	_sound->playSound("dreams2.voc", 1);
-	while (!shouldExit() && _sound->isPlaying())
+	while (!shouldExit() && _sound->isSoundPlaying())
 		_events->pollEventsAndWait();
 
 	_sound->playSound("laff1.voc", 1);
-	while (!shouldExit() && _sound->isPlaying())
+	while (!shouldExit() && _sound->isSoundPlaying())
 		_events->pollEventsAndWait();
 
 	_events->updateGameCounter();
diff --git a/engines/xeen/worldofxeen/worldofxeen_cutscenes.cpp b/engines/xeen/worldofxeen/worldofxeen_cutscenes.cpp
index 3ac3962f69..f53de8d94f 100644
--- a/engines/xeen/worldofxeen/worldofxeen_cutscenes.cpp
+++ b/engines/xeen/worldofxeen/worldofxeen_cutscenes.cpp
@@ -78,7 +78,7 @@ void WorldOfXeenCutscenes::worldEnding1() {
 
 	windows[41].writeString("\x1\xD");
 	screen.fadeOut();
-	while (!_vm->shouldExit() && sound.isPlaying())
+	while (!_vm->shouldExit() && sound.isSoundPlaying())
 		events.pollEventsAndWait();
 
 	sound.playSong("nwblksmt.m");
@@ -211,7 +211,7 @@ void WorldOfXeenCutscenes::worldEnding1() {
 
 	frame = 0;
 	for (int idx = 185; idx > 68 && !_vm->shouldExit(); idx -= 3) {
-		if (!sound.isPlaying())
+		if (!sound.isSoundPlaying())
 			sound.playSound("cast.voc");
 
 		events.updateGameCounter();
@@ -226,7 +226,7 @@ void WorldOfXeenCutscenes::worldEnding1() {
 	}
 
 	for (int idx = 0; idx < 17 && !_vm->shouldExit(); ++idx) {
-		if (!sound.isPlaying())
+		if (!sound.isSoundPlaying())
 			sound.playSound("cast.voc");
 
 		events.updateGameCounter();
@@ -326,7 +326,7 @@ void WorldOfXeenCutscenes::worldEnding1() {
 	sound.playSound("cast.voc");
 
 	for (int idx = 0; idx < 5 && !_vm->shouldExit(); ++idx) {
-		if (!sound.isPlaying())
+		if (!sound.isSoundPlaying())
 			sound.playSound("cast.voc");
 
 		events.updateGameCounter();
@@ -342,7 +342,7 @@ void WorldOfXeenCutscenes::worldEnding1() {
 
 	frame = 0;
 	for (int idx = 0; idx < 16 && !_vm->shouldExit(); ++idx) {
-		if (!sound.isPlaying())
+		if (!sound.isSoundPlaying())
 			sound.playSound("cast.voc");
 
 		events.updateGameCounter();
@@ -359,7 +359,7 @@ void WorldOfXeenCutscenes::worldEnding1() {
 
 	frame = 0;
 	for (int idx = 11; idx < 82 && !_vm->shouldExit(); ++idx) {
-		if (!sound.isPlaying())
+		if (!sound.isSoundPlaying())
 			sound.playSound("cast.voc");
 
 		events.updateGameCounter();
@@ -505,7 +505,7 @@ void WorldOfXeenCutscenes::worldEnding3() {
 	for (int idx = 0; idx < 52 && !_vm->shouldExit(); ++idx) {
 		if (idx == 28)
 			sound.playSound("click.voc");
-		if (!sound.isPlaying())
+		if (!sound.isSoundPlaying())
 			sound.playSound("comet.voc");
 
 		events.updateGameCounter();
@@ -587,7 +587,7 @@ void WorldOfXeenCutscenes::worldEnding4() {
 	screen.fadeIn();
 
 	for (int idx = 0; idx < 89 && !_vm->shouldExit(); ++idx) {
-		if (!sound.isPlaying())
+		if (!sound.isSoundPlaying())
 			sound.playSound("comet.voc");
 		if (idx == 19 || idx == 60)
 			sound.playSound("click.voc");
@@ -609,7 +609,7 @@ void WorldOfXeenCutscenes::worldEnding4() {
 	screen.fadeIn();
 
 	for (int idx = 0; idx < 138 && !_vm->shouldExit(); ++idx) {
-		if (!sound.isPlaying() && idx > 98)
+		if (!sound.isSoundPlaying() && idx > 98)
 			sound.playSound("rumble.voc");
 
 		events.updateGameCounter();