From 54562554f9b274ce527a54e7fe87b8ff354fe0f4 Mon Sep 17 00:00:00 2001
From: Evgeny Grechnikov
Date: Thu, 18 Oct 2018 00:38:01 +0300
Subject: LASTEXPRESS: better names in sound code

Refactoring, no changes in behaviour.
---
 engines/lastexpress/game/action.cpp    | 4 ++--
 engines/lastexpress/game/entities.cpp  | 4 ++--
 engines/lastexpress/game/inventory.cpp | 2 +-
 engines/lastexpress/game/logic.cpp     | 8 ++++----
 engines/lastexpress/game/savegame.cpp  | 2 +-
 engines/lastexpress/game/scenes.cpp    | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'engines/lastexpress/game')

diff --git a/engines/lastexpress/game/action.cpp b/engines/lastexpress/game/action.cpp
index f623ed032e..d0ef92770e 100644
--- a/engines/lastexpress/game/action.cpp
+++ b/engines/lastexpress/game/action.cpp
@@ -1944,7 +1944,7 @@ void Action::playAnimation(EventIndex index, bool debugMode) const {
 
 		if (getGlobalTimer()) {
 			if (getSoundQueue()->isBuffered("TIMER")) {
-				getSoundQueue()->processEntry("TIMER");
+				getSoundQueue()->fade("TIMER");
 				setGlobalTimer(105);
 			}
 		}
@@ -1962,7 +1962,7 @@ void Action::playAnimation(EventIndex index, bool debugMode) const {
 			animation.play();
 
 		if (getSoundQueue()->isBuffered("TIMER"))
-			getSoundQueue()->removeFromQueue("TIMER");
+			getSoundQueue()->stop("TIMER");
 	}
 
 	// Show cursor
diff --git a/engines/lastexpress/game/entities.cpp b/engines/lastexpress/game/entities.cpp
index 059d2deb87..165319b782 100644
--- a/engines/lastexpress/game/entities.cpp
+++ b/engines/lastexpress/game/entities.cpp
@@ -296,7 +296,7 @@ void Entities::setupChapter(ChapterIndex chapter) {
 		memset(&_compartments1, 0, sizeof(_compartments1));
 		memset(&_positions, 0, sizeof(_positions));
 
-		getSoundQueue()->resetQueue(kSoundType13);
+		getSoundQueue()->stopAllExcept(kSoundTagMenu);
 	}
 
 	// we skip the header when doing entity setup
@@ -367,7 +367,7 @@ void Entities::resetState(EntityIndex entityIndex) {
 	getData(entityIndex)->inventoryItem = kItemNone;
 
 	if (getSoundQueue()->isBuffered(entityIndex))
-		getSoundQueue()->removeFromQueue(entityIndex);
+		getSoundQueue()->stop(entityIndex);
 
 	clearSequences(entityIndex);
 
diff --git a/engines/lastexpress/game/inventory.cpp b/engines/lastexpress/game/inventory.cpp
index 756ecda73f..f25463492b 100644
--- a/engines/lastexpress/game/inventory.cpp
+++ b/engines/lastexpress/game/inventory.cpp
@@ -165,7 +165,7 @@ void Inventory::handleMouseEvent(const Common::Event &ev) {
 
 		} else if (ev.type == Common::EVENT_RBUTTONDOWN && getGlobalTimer()) {
 			if (getSoundQueue()->isBuffered("TIMER"))
-				getSoundQueue()->removeFromQueue("TIMER");
+				getSoundQueue()->stop("TIMER");
 
 			setGlobalTimer(900);
 		}
diff --git a/engines/lastexpress/game/logic.cpp b/engines/lastexpress/game/logic.cpp
index 7ba2b0ff85..9aad0308eb 100644
--- a/engines/lastexpress/game/logic.cpp
+++ b/engines/lastexpress/game/logic.cpp
@@ -420,7 +420,7 @@ void Logic::resetState() {
  */
 void Logic::gameOver(SavegameType type, uint32 value, SceneIndex sceneIndex, bool showScene) const {
 
-	getSoundQueue()->processEntries();
+	getSoundQueue()->endAmbient();
 	getEntities()->reset();
 	getFlags()->isGameRunning = false;
 	getSavePoints()->reset();
@@ -428,7 +428,7 @@ void Logic::gameOver(SavegameType type, uint32 value, SceneIndex sceneIndex, boo
 
 	if (showScene) {
 
-		getSoundQueue()->processEntry(kSoundType11);
+		getSoundQueue()->fade(kSoundTagIntro);
 
 		if (sceneIndex && !getFlags()->mouseRightClick) {
 			getScenes()->loadScene(sceneIndex);
@@ -447,7 +447,7 @@ void Logic::gameOver(SavegameType type, uint32 value, SceneIndex sceneIndex, boo
 }
 
 void Logic::switchChapter() const {
-	getSoundQueue()->clearStatus();
+	getSoundQueue()->stopAll();
 
 	switch(getState()->progress.chapter) {
 	default:
@@ -487,7 +487,7 @@ void Logic::switchChapter() const {
 }
 
 void Logic::playFinalSequence() const {
-	getSoundQueue()->processEntries();
+	getSoundQueue()->endAmbient();
 
 	_action->playAnimation(kEventFinalSequence);
 	showCredits();
diff --git a/engines/lastexpress/game/savegame.cpp b/engines/lastexpress/game/savegame.cpp
index ce53e6eadf..8b45835fc7 100644
--- a/engines/lastexpress/game/savegame.cpp
+++ b/engines/lastexpress/game/savegame.cpp
@@ -509,7 +509,7 @@ void SaveLoad::loadLastGame() {
 	_gameTicksLastSavegame = getState()->timeTicks;
 
 	if (header.keepIndex) {
-		getSoundQueue()->clearQueue();
+		getSoundQueue()->destroyAllSound();
 
 		readEntry(&type, &entity, &val, false);
 	}
diff --git a/engines/lastexpress/game/scenes.cpp b/engines/lastexpress/game/scenes.cpp
index 9aa85381ae..b68e5b0089 100644
--- a/engines/lastexpress/game/scenes.cpp
+++ b/engines/lastexpress/game/scenes.cpp
@@ -1064,7 +1064,7 @@ void SceneManager::preProcessScene(SceneIndex *index) {
 	Scene *newScene = getScenes()->get(*index);
 	if (getSoundQueue()->isBuffered(kEntityTables4)) {
 		if (newScene->type != Scene::kTypeReadText || newScene->param1)
-			getSoundQueue()->processEntry(kEntityTables4);
+			getSoundQueue()->fade(kEntityTables4);
 	}
 
 	// Cleanup beetle sequences
@@ -1162,7 +1162,7 @@ void SceneManager::postProcessScene() {
 		if (getState()->time >= kTimeCityGalanta || getProgress().field_18 == 4)
 			break;
 
-		getSoundQueue()->processEntry(kSoundType7);
+		getSoundQueue()->fade(kSoundTagLink);
 		getSound()->playSound(kEntityTrain, "LIB050", kVolumeFull);
 
 		switch (getProgress().chapter) {
-- 
cgit v1.2.3