Merge remote branch 'remotes/dreammaster/tsage_sound'

Conflicts:
	engines/tsage/ringworld_scenes1.cpp
	engines/tsage/ringworld_scenes5.cpp
	engines/tsage/tsage.h

1 files changed, 25 insertions, 24 deletions

diff --git a/engines/tsage/ringworld_scenes8.cpp b/engines/tsage/ringworld_scenes8.cpp
index 934c7494fa..2b329b958a 100644
--- a/engines/tsage/ringworld_scenes8.cpp
+++ b/engines/tsage/ringworld_scenes8.cpp
@@ -60,7 +60,7 @@ void Scene7000::Action1::signal() {
 		setAction(&scene->_action6, this);
 		break;
 	case 2:
-		scene->_soundHandler.startSound(252);
+		scene->_soundHandler.play(252);
 		scene->_object8.remove();
 		scene->_object1.postInit();
 		scene->_object1.setVisage(7003);
@@ -184,7 +184,7 @@ void Scene7000::Action4::signal() {
 		setDelay(300);
 		break;
 	case 2:
-		_globals->_soundHandler.startSound(252);
+		_globals->_soundHandler.play(252);
 		scene->_object1.show();
 		scene->_object1.setStrip(3);
 		scene->_object1.setFrame(1);
@@ -214,7 +214,7 @@ void Scene7000::Action5::signal() {
 	}
 	case 1:
 		_globals->_player.checkAngle(&scene->_object1);
-		_globals->_soundHandler.startSound(252);
+		_globals->_soundHandler.play(252);
 		scene->_object1.setStrip(2);
 		scene->_stripManager.start(7015, this);
 		break;
@@ -546,7 +546,7 @@ void Scene7000::postInit(SceneObjectList *OwnerList) {
 		_object1.animate(ANIM_MODE_8, 0, NULL);
 		_globals->_sceneItems.push_back(&_object1);
 	}
-	_soundHandler.startSound(251);
+	_soundHandler.play(251);
 	if (_globals->_sceneManager._previousScene == 2100) {
 		if (_globals->getFlag(72)) {
 			_globals->_player.postInit();
@@ -565,7 +565,7 @@ void Scene7000::postInit(SceneObjectList *OwnerList) {
 				setAction(&_action1);
 			}
 		} else {
-			_globals->_soundHandler.startSound(250);
+			_globals->_soundHandler.play(250);
 			_globals->setFlag(72);
 
 			_object3.postInit();
@@ -611,9 +611,9 @@ void Scene7000::postInit(SceneObjectList *OwnerList) {
 		_object3.setVisage(5001);
 		_object3.setStrip2(1);
 		_object3.setPosition(Common::Point(307, 0));
-		_soundHandler.startSound(151);
-		_soundHandler.proc5(1);
-		_globals->_soundHandler.startSound(250);
+		_soundHandler.play(151);
+		_soundHandler.holdAt(true);
+		_globals->_soundHandler.play(250);
 		setAction(&_action3);
 	}
 
@@ -1135,9 +1135,9 @@ void Scene7100::postInit(SceneObjectList *OwnerList) {
 	_object1.setPosition(Common::Point(100, 100));
 
 	setAction(&_action11);
-	_soundHandler1.startSound(270);
-	_soundHandler2.startSound(275);
-	_globals->_soundHandler.startSound(270);
+	_soundHandler1.play(270);
+	_soundHandler2.play(275);
+	_globals->_soundHandler.play(270);
 }
 /*--------------------------------------------------------------------------
  * Scene 7200 - Underwater: Entering the cave
@@ -1302,7 +1302,7 @@ void Scene7200::postInit(SceneObjectList *OwnerList) {
 	_swimmer.setPosition(Common::Point(-8, 16));
 
 	setAction(&_action1);
-	_soundHandler.startSound(271);
+	_soundHandler.play(271);
 }
 
 /*--------------------------------------------------------------------------
@@ -1344,7 +1344,7 @@ void Scene7300::Action1::signal() {
 		break;
 	case 7:
 		setDelay(3);
-		_globals->_soundHandler.proc1(NULL);
+		_globals->_soundHandler.fadeOut(NULL);
 		break;
 	case 8:
 		_globals->_sceneManager.changeScene(2280);
@@ -1497,7 +1497,7 @@ void Scene7300::postInit(SceneObjectList *OwnerList) {
 	_object8._numFrames = 2;
 
 	setAction(&_action1);
-	_globals->_soundHandler.startSound(272);
+	_globals->_soundHandler.play(272);
 }
 
 /*--------------------------------------------------------------------------
@@ -1601,8 +1601,8 @@ void Scene7600::postInit(SceneObjectList *OwnerList) {
 	}
 	_sceneBounds.center(_globals->_player._position.x, _globals->_player._position.y);
 	loadScene(7600);
-	_soundHandler2.startSound(255);
-	_soundHandler1.startSound(251);
+	_soundHandler2.play(255);
+	_soundHandler1.play(251);
 }
 
 /*--------------------------------------------------------------------------
@@ -1665,7 +1665,7 @@ void Scene7700::Action3::signal() {
 		setDelay(60);
 		// No break on purpose!
 	case 2:
-		scene->_soundHandler.startSound(260);
+		scene->_soundHandler.play(260);
 		scene->_object8.setVisage(7703);
 		scene->_object8.setPosition(Common::Point(177, 97));
 		scene->_object8.setStrip2(3);
@@ -1874,7 +1874,7 @@ void Scene7700::SceneHotspot8::doAction(int action) {
 		break;
 	case CURSOR_USE:
 		scene->_sceneMode = 7709;
-		scene->_soundHandler.startSound(259);
+		scene->_soundHandler.play(259);
 		scene->_object15.setFrame(scene->_object15.getFrameCount());
 		scene->_object15.animate(ANIM_MODE_6, scene);
 		if ((scene->_field977 == 2) && (scene->_field97B == 0)) {
@@ -1900,7 +1900,7 @@ void Scene7700::SceneHotspot9::doAction(int action) {
 		break;
 	case CURSOR_USE:
 		scene->_sceneMode = 7709;
-		scene->_soundHandler.startSound(259);
+		scene->_soundHandler.play(259);
 		scene->_object15.setFrame(1);
 		scene->_object15.animate(ANIM_MODE_5, scene);
 		if (scene->_field977 > 2) {
@@ -2034,7 +2034,7 @@ void Scene7700::Object7::doAction(int action) {
 		break;
 	case OBJECT_STUNNER:
 		if (!_globals->getFlag(78)) {
-			_globals->_soundHandler.proc3();
+			_globals->_soundHandler.stop();
 			_globals->setFlag(78);
 			setAction(NULL);
 			_globals->_player.disableControl();
@@ -2124,7 +2124,8 @@ void Scene7700::Object9::doAction(int action) {
 					_globals->_sceneItems.push_front(&scene->_object10);
 					scene->_object10.fixPriority(240);
 				}
-				scene->_soundHandler.startSound(262);
+
+				scene->_soundHandler.play(262);
 				scene->_object14.animate(ANIM_MODE_5, NULL);
 			}
 			_globals->_events.setCursor(CURSOR_WALK);
@@ -2222,7 +2223,7 @@ void Scene7700::signal() {
 		}
 		break;
 	case 7702:
-		_soundHandler.proc1(0);
+		_soundHandler.fadeOut(0);
 		_globals->_sceneManager.changeScene(7600);
 		break;
 	case 7703:
@@ -2233,7 +2234,7 @@ void Scene7700::signal() {
 		_globals->_player.enableControl();
 		break;
 	case 7704:
-		_globals->_soundHandler.startSound(256);
+		_globals->_soundHandler.play(256);
 		_prof.setStrip2(4);
 		_prof.setFrame2(1);
 		_prof.setPosition(Common::Point(159, 87));
@@ -2520,7 +2521,7 @@ void Scene7700::postInit(SceneObjectList *OwnerList) {
 
 	_sceneMode = 7701;
 	setAction(&_sequenceManager, this, 7701, &_globals->_player, NULL);
-	_soundHandler.startSound(256);
+	_soundHandler.play(256);
 }
 
 Scene7700::Scene7700() {