MOHAWK: Rename some VideoManager functions so we have some unified naming between versions

svn-id: r55312

7 files changed, 67 insertions, 67 deletions

diff --git a/engines/mohawk/myst_stacks/channelwood.cpp b/engines/mohawk/myst_stacks/channelwood.cpp
index a6c9c49049..df9e4b71e4 100644
--- a/engines/mohawk/myst_stacks/channelwood.cpp
+++ b/engines/mohawk/myst_stacks/channelwood.cpp
@@ -238,10 +238,10 @@ void MystScriptParser_Channelwood::opcode_101(uint16 op, uint16 var, uint16 argc
 		//       of start and finish points.
 		if (!_vm->_varStore->getVar(6)) {
 			// Play Pipe Extending i.e. 0 to 1/2 way through file
-			_vm->_video->playMovie(_vm->wrapMovieFilename("pipebrid", kChannelwoodStack), 267, 170);
+			_vm->_video->playMovieBlocking(_vm->wrapMovieFilename("pipebrid", kChannelwoodStack), 267, 170);
 		} else {
 			// Play Pipe Retracting i.e. 1/2 way to end of file
-			_vm->_video->playMovie(_vm->wrapMovieFilename("pipebrid", kChannelwoodStack), 267, 170);
+			_vm->_video->playMovieBlocking(_vm->wrapMovieFilename("pipebrid", kChannelwoodStack), 267, 170);
 		}
 	} else
 		unknown(op, var, argc, argv);
@@ -397,16 +397,16 @@ void MystScriptParser_Channelwood::opcode_117(uint16 op, uint16 var, uint16 argc
 
 		switch (button) {
 		case 0:
-			_vm->_video->playMovie(_vm->wrapMovieFilename("monalgh", kChannelwoodStack), 227, 71);
+			_vm->_video->playMovieBlocking(_vm->wrapMovieFilename("monalgh", kChannelwoodStack), 227, 71);
 			break;
 		case 1:
-			_vm->_video->playMovie(_vm->wrapMovieFilename("monamth", kChannelwoodStack), 227, 71);
+			_vm->_video->playMovieBlocking(_vm->wrapMovieFilename("monamth", kChannelwoodStack), 227, 71);
 			break;
 		case 2:
-			_vm->_video->playMovie(_vm->wrapMovieFilename("monasirs", kChannelwoodStack), 227, 71);
+			_vm->_video->playMovieBlocking(_vm->wrapMovieFilename("monasirs", kChannelwoodStack), 227, 71);
 			break;
 		case 3:
-			_vm->_video->playMovie(_vm->wrapMovieFilename("monsmsg", kChannelwoodStack), 227, 71);
+			_vm->_video->playMovieBlocking(_vm->wrapMovieFilename("monsmsg", kChannelwoodStack), 227, 71);
 			break;
 		default:
 			warning("Opcode %d Control Variable Out of Range", op);
@@ -435,16 +435,16 @@ void MystScriptParser_Channelwood::opcode_119(uint16 op, uint16 var, uint16 argc
 		// TODO: Not 100% sure about movie position...
 		switch (_vm->_varStore->getVar(17)) {
 		case 0:
-			_vm->_video->playMovie(_vm->wrapMovieFilename("holoalgh", kChannelwoodStack), 126, 74);
+			_vm->_video->playMovieBlocking(_vm->wrapMovieFilename("holoalgh", kChannelwoodStack), 126, 74);
 			break;
 		case 1:
-			_vm->_video->playMovie(_vm->wrapMovieFilename("holoamth", kChannelwoodStack), 126, 74);
+			_vm->_video->playMovieBlocking(_vm->wrapMovieFilename("holoamth", kChannelwoodStack), 126, 74);
 			break;
 		case 2:
-			_vm->_video->playMovie(_vm->wrapMovieFilename("holoasir", kChannelwoodStack), 126, 74);
+			_vm->_video->playMovieBlocking(_vm->wrapMovieFilename("holoasir", kChannelwoodStack), 126, 74);
 			break;
 		case 3:
-			_vm->_video->playMovie(_vm->wrapMovieFilename("holosmsg", kChannelwoodStack), 126, 74);
+			_vm->_video->playMovieBlocking(_vm->wrapMovieFilename("holosmsg", kChannelwoodStack), 126, 74);
 			break;
 		default:
 			warning("Opcode %d Control Variable Out of Range", op);
@@ -509,19 +509,19 @@ void MystScriptParser_Channelwood::opcode_201(uint16 op, uint16 var, uint16 argc
 		// TODO: Fill in Function. Video Playback? Rect from invoking hotspot resource...
 		if (false) {
 			// Card 3161
-			_vm->_video->playMovie(_vm->wrapMovieFilename("bridge", kChannelwoodStack), 292, 204);
+			_vm->_video->playMovieBlocking(_vm->wrapMovieFilename("bridge", kChannelwoodStack), 292, 204);
 
 			// Card 3247
-			_vm->_video->playMovie(_vm->wrapMovieFilename("welev1dn", kChannelwoodStack), 214, 107);
-			_vm->_video->playMovie(_vm->wrapMovieFilename("welev1up", kChannelwoodStack), 214, 107);
+			_vm->_video->playMovieBlocking(_vm->wrapMovieFilename("welev1dn", kChannelwoodStack), 214, 107);
+			_vm->_video->playMovieBlocking(_vm->wrapMovieFilename("welev1up", kChannelwoodStack), 214, 107);
 
 			// Card 3252
-			_vm->_video->playMovie(_vm->wrapMovieFilename("welev2dn", kChannelwoodStack), 215, 118);
-			_vm->_video->playMovie(_vm->wrapMovieFilename("welev2up", kChannelwoodStack), 215, 118);
+			_vm->_video->playMovieBlocking(_vm->wrapMovieFilename("welev2dn", kChannelwoodStack), 215, 118);
+			_vm->_video->playMovieBlocking(_vm->wrapMovieFilename("welev2up", kChannelwoodStack), 215, 118);
 
 			// Card 3259
-			_vm->_video->playMovie(_vm->wrapMovieFilename("welev3dn", kChannelwoodStack), 213, 99);
-			_vm->_video->playMovie(_vm->wrapMovieFilename("welev3up", kChannelwoodStack), 213, 99);
+			_vm->_video->playMovieBlocking(_vm->wrapMovieFilename("welev3dn", kChannelwoodStack), 213, 99);
+			_vm->_video->playMovieBlocking(_vm->wrapMovieFilename("welev3up", kChannelwoodStack), 213, 99);
 		}
 	} else
 		unknown(op, var, argc, argv);
diff --git a/engines/mohawk/myst_stacks/dni.cpp b/engines/mohawk/myst_stacks/dni.cpp
index b6becff793..d79170c41b 100644
--- a/engines/mohawk/myst_stacks/dni.cpp
+++ b/engines/mohawk/myst_stacks/dni.cpp
@@ -121,7 +121,7 @@ void MystScriptParser_Dni::o_handPage(uint16 op, uint16 var, uint16 argc, uint16
 void MystScriptParser_Dni::atrusLeft_run() {
 	if (_vm->_system->getMillis() > _atrusLeftTime + 63333) {
 		_video = _vm->wrapMovieFilename("atrus2", kDniStack);
-		VideoHandle atrus = _vm->_video->playBackgroundMovie(_video, 215, 77);
+		VideoHandle atrus = _vm->_video->playMovie(_video, 215, 77);
 		_vm->_video->setVideoBounds(atrus, Graphics::VideoTimestamp(0, 600), Graphics::VideoTimestamp(98000, 600));
 
 		_waitForLoop = true;
@@ -139,7 +139,7 @@ void MystScriptParser_Dni::atrusLeft_run() {
 
 void MystScriptParser_Dni::loopVideo_run() {
 	if (!_vm->_video->isVideoPlaying()) {
-		VideoHandle atrus = _vm->_video->playBackgroundMovie(_video, 215, 77);
+		VideoHandle atrus = _vm->_video->playMovie(_video, 215, 77);
 		_vm->_video->setVideoBounds(atrus, Graphics::VideoTimestamp(_loopStart, 600), Graphics::VideoTimestamp(_loopEnd, 600));
 		_vm->_video->setVideoLooping(atrus, true);
 
@@ -155,13 +155,13 @@ void MystScriptParser_Dni::atrus_run() {
 		// Atrus asking for page
 		if (!_vm->_video->isVideoPlaying()) {
 			_video = _vm->wrapMovieFilename("atr1page", kDniStack);
-			VideoHandle atrus = _vm->_video->playBackgroundMovie(_video, 215, 77, true);
+			VideoHandle atrus = _vm->_video->playMovie(_video, 215, 77, true);
 			_vm->_video->setVideoBounds(atrus, Graphics::VideoTimestamp(7388, 600), Graphics::VideoTimestamp(14700, 600));
 		}
 	} else if (_globals.ending != 3 && _globals.ending != 4) {
 		if (_globals.heldPage == 13) {
 			_video = _vm->wrapMovieFilename("atr1page", kDniStack);
-			VideoHandle atrus = _vm->_video->playBackgroundMovie(_video, 215, 77);
+			VideoHandle atrus = _vm->_video->playMovie(_video, 215, 77);
 			_vm->_video->setVideoBounds(atrus, Graphics::VideoTimestamp(0, 600), Graphics::VideoTimestamp(14700, 600));
 
 			_waitForLoop = true;
@@ -173,7 +173,7 @@ void MystScriptParser_Dni::atrus_run() {
 
 		} else {
 			_video = _vm->wrapMovieFilename("atr1nopg", kDniStack);
-			VideoHandle atrus = _vm->_video->playBackgroundMovie(_video, 215, 77);
+			VideoHandle atrus = _vm->_video->playMovie(_video, 215, 77);
 			_vm->_video->setVideoBounds(atrus, Graphics::VideoTimestamp(0, 600), Graphics::VideoTimestamp(46175, 600));
 
 			_waitForLoop = true;
@@ -184,7 +184,7 @@ void MystScriptParser_Dni::atrus_run() {
 			_globals.ending = 3;
 		}
 	} else if (!_vm->_video->isVideoPlaying()) {
-		_vm->_video->playBackgroundMovie(_vm->wrapMovieFilename("atrwrite", kDniStack), 215, 77, true);
+		_vm->_video->playMovie(_vm->wrapMovieFilename("atrwrite", kDniStack), 215, 77, true);
 	}
 }
 
diff --git a/engines/mohawk/myst_stacks/intro.cpp b/engines/mohawk/myst_stacks/intro.cpp
index 4d5801009e..a4a8cf2a89 100644
--- a/engines/mohawk/myst_stacks/intro.cpp
+++ b/engines/mohawk/myst_stacks/intro.cpp
@@ -104,7 +104,7 @@ void MystScriptParser_Intro::introMovies_run() {
 	case 0:
 		// Play the Mattel (or UbiSoft) logo in the Myst ME Mac version
 		if ((_vm->getFeatures() & GF_ME) && _vm->getPlatform() == Common::kPlatformMacintosh) {
-			_vm->_video->playBackgroundMovie(_vm->wrapMovieFilename("mattel", kIntroStack));
+			_vm->_video->playMovie(_vm->wrapMovieFilename("mattel", kIntroStack));
 			_introStep = 1;
 		} else
 			_introStep = 2;
@@ -116,9 +116,9 @@ void MystScriptParser_Intro::introMovies_run() {
 	case 2:
 		_introStep = 3;
 		if ((_vm->getFeatures() & GF_ME) && _vm->getPlatform() == Common::kPlatformMacintosh)
-			_vm->_video->playBackgroundMovie(_vm->wrapMovieFilename("presto", kIntroStack));
+			_vm->_video->playMovie(_vm->wrapMovieFilename("presto", kIntroStack));
 		else
-			_vm->_video->playBackgroundMovie(_vm->wrapMovieFilename("broder", kIntroStack));
+			_vm->_video->playMovie(_vm->wrapMovieFilename("broder", kIntroStack));
 		break;
 	case 3:
 		if (!_vm->_video->isVideoPlaying())
@@ -126,7 +126,7 @@ void MystScriptParser_Intro::introMovies_run() {
 		break;
 	case 4:
 		_introStep = 5;
-		_vm->_video->playBackgroundMovie(_vm->wrapMovieFilename("cyanlogo", kIntroStack));
+		_vm->_video->playMovie(_vm->wrapMovieFilename("cyanlogo", kIntroStack));
 		break;
 	case 5:
 		if (!_vm->_video->isVideoPlaying())
@@ -139,9 +139,9 @@ void MystScriptParser_Intro::introMovies_run() {
 			if ((_vm->getFeatures() & GF_ME) && _vm->getPlatform() == Common::kPlatformMacintosh)
 				// intro.mov uses Sorenson, introc uses Cinepak. Otherwise, they're the same.
 				// TODO: Switch back to the SVQ version when we support it
-				_vm->_video->playBackgroundMovie(_vm->wrapMovieFilename("introc", kIntroStack));
+				_vm->_video->playMovie(_vm->wrapMovieFilename("introc", kIntroStack));
 			else
-				_vm->_video->playBackgroundMovie(_vm->wrapMovieFilename("intro", kIntroStack));
+				_vm->_video->playMovie(_vm->wrapMovieFilename("intro", kIntroStack));
 		}
 		break;
 	case 7:
diff --git a/engines/mohawk/myst_stacks/mechanical.cpp b/engines/mohawk/myst_stacks/mechanical.cpp
index f0fcab9a15..96b9883ca4 100644
--- a/engines/mohawk/myst_stacks/mechanical.cpp
+++ b/engines/mohawk/myst_stacks/mechanical.cpp
@@ -224,10 +224,10 @@ void MystScriptParser_Mechanical::opcode_105(uint16 op, uint16 var, uint16 argc,
 
 		if (_vm->_varStore->getVar(10)) {
 			// TODO: Play Movie from 0 to 1/2 way...
-			_vm->_video->playMovie(_vm->wrapMovieFilename("hhstairs", kMechanicalStack), 174, 222);
+			_vm->_video->playMovieBlocking(_vm->wrapMovieFilename("hhstairs", kMechanicalStack), 174, 222);
 		} else {
 			// TODO: Play Movie from 1/2 way to end...
-			_vm->_video->playMovie(_vm->wrapMovieFilename("hhstairs", kMechanicalStack), 174, 222);
+			_vm->_video->playMovieBlocking(_vm->wrapMovieFilename("hhstairs", kMechanicalStack), 174, 222);
 		}
 	}
 }
@@ -243,7 +243,7 @@ void MystScriptParser_Mechanical::opcode_121(uint16 op, uint16 var, uint16 argc,
 		warning("TODO: Opcode %d Movie Time Index %d to %d\n", op, startTime, endTime);
 		// TODO: Need version of playMovie blocking which allows selection
 		//       of start and finish points.
-		_vm->_video->playMovie(_vm->wrapMovieFilename("ewindow", kMechanicalStack), 253, 0);
+		_vm->_video->playMovieBlocking(_vm->wrapMovieFilename("ewindow", kMechanicalStack), 253, 0);
 	} else
 		unknown(op, var, argc, argv);
 }
@@ -270,7 +270,7 @@ void MystScriptParser_Mechanical::opcode_123(uint16 op, uint16 var, uint16 argc,
 		// TODO: Need version of playMovie blocking which allows selection
 		//       of start and finish points.
 		// TODO: Not 100% sure about movie position
-		_vm->_video->playMovie(_vm->wrapMovieFilename("hcelev", kMechanicalStack), 205, 40);
+		_vm->_video->playMovieBlocking(_vm->wrapMovieFilename("hcelev", kMechanicalStack), 205, 40);
 	} else
 		unknown(op, var, argc, argv);
 }
diff --git a/engines/mohawk/myst_stacks/myst.cpp b/engines/mohawk/myst_stacks/myst.cpp
index 9120e77b7b..8682477a6b 100644
--- a/engines/mohawk/myst_stacks/myst.cpp
+++ b/engines/mohawk/myst_stacks/myst.cpp
@@ -880,9 +880,9 @@ void MystScriptParser_Myst::o_fireplaceRotation(uint16 op, uint16 var, uint16 ar
 	debugC(kDebugScript, "\tmovieNum: %d", movieNum);
 
 	if (movieNum)
-		_vm->_video->playMovie(_vm->wrapMovieFilename("fpout", kMystStack), 167, 4);
+		_vm->_video->playMovieBlocking(_vm->wrapMovieFilename("fpout", kMystStack), 167, 4);
 	else
-		_vm->_video->playMovie(_vm->wrapMovieFilename("fpin", kMystStack), 167, 4);
+		_vm->_video->playMovieBlocking(_vm->wrapMovieFilename("fpin", kMystStack), 167, 4);
 }
 
 void MystScriptParser_Myst::o_courtyardBoxesCheckSolution(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
@@ -1132,7 +1132,7 @@ void MystScriptParser_Myst::o_clockWheelsExecute(uint16 op, uint16 var, uint16 a
 		_vm->_system->delayMillis(500);
 
 		// Gears rise up
-		VideoHandle gears = _vm->_video->playBackgroundMovie(_vm->wrapMovieFilename("gears", kMystStack), 305, 33);
+		VideoHandle gears = _vm->_video->playMovie(_vm->wrapMovieFilename("gears", kMystStack), 305, 33);
 		_vm->_video->setVideoBounds(gears, Graphics::VideoTimestamp(0, 600), Graphics::VideoTimestamp(650, 600));
 		_vm->_video->waitUntilMovieEnds(gears);
 
@@ -1144,7 +1144,7 @@ void MystScriptParser_Myst::o_clockWheelsExecute(uint16 op, uint16 var, uint16 a
 		_vm->_system->delayMillis(500);
 
 		// Gears sink down
-		VideoHandle gears = _vm->_video->playBackgroundMovie(_vm->wrapMovieFilename("gears", kMystStack), 305, 33);
+		VideoHandle gears = _vm->_video->playMovie(_vm->wrapMovieFilename("gears", kMystStack), 305, 33);
 		_vm->_video->setVideoBounds(gears, Graphics::VideoTimestamp(700, 600), Graphics::VideoTimestamp(1300, 600));
 		_vm->_video->waitUntilMovieEnds(gears);
 
@@ -1188,14 +1188,14 @@ void MystScriptParser_Myst::o_imagerPlayButton(uint16 op, uint16 var, uint16 arg
 		if (_state.imagerActive) {
 			// Mountains disappearing
 			Common::String file = _vm->wrapMovieFilename("vltmntn", kMystStack);
-			VideoHandle mountain = _vm->_video->playBackgroundMovie(file, 159, 96, false);
+			VideoHandle mountain = _vm->_video->playMovie(file, 159, 96, false);
 			_vm->_video->setVideoBounds(mountain, Graphics::VideoTimestamp(11180, 600), Graphics::VideoTimestamp(16800, 600));
 
 			_state.imagerActive = 0;
 		} else {
 			// Mountains appearing
 			Common::String file = _vm->wrapMovieFilename("vltmntn", kMystStack);
-			VideoHandle mountain = _vm->_video->playBackgroundMovie(file, 159, 96, false);
+			VideoHandle mountain = _vm->_video->playMovie(file, 159, 96, false);
 			_vm->_video->setVideoBounds(mountain, Graphics::VideoTimestamp(0, 600), Graphics::VideoTimestamp(11180, 600));
 
 			_state.imagerActive = 1;
@@ -1318,10 +1318,10 @@ void MystScriptParser_Myst::o_towerElevatorAnimation(uint16 op, uint16 var, uint
 
 	switch (argv[0]) {
 	case 0:
-		_vm->_video->playMovie(_vm->wrapMovieFilename("libdown", kMystStack), 216, 78);
+		_vm->_video->playMovieBlocking(_vm->wrapMovieFilename("libdown", kMystStack), 216, 78);
 		break;
 	case 1:
-		_vm->_video->playMovie(_vm->wrapMovieFilename("libup", kMystStack), 216, 78);
+		_vm->_video->playMovieBlocking(_vm->wrapMovieFilename("libup", kMystStack), 216, 78);
 		break;
 	default:
 		break;
@@ -2198,12 +2198,12 @@ void MystScriptParser_Myst::rocketCheckSolution() {
 
 		// Book appearing
 		Common::String movieFile = _vm->wrapMovieFilename("selenbok", kMystStack);
-		_rocketLinkBook = _vm->_video->playBackgroundMovie(movieFile, 224, 41);
+		_rocketLinkBook = _vm->_video->playMovie(movieFile, 224, 41);
 		_vm->_video->setVideoBounds(_rocketLinkBook, Graphics::VideoTimestamp(0, 600), Graphics::VideoTimestamp(660, 600));
 		_vm->_video->waitUntilMovieEnds(_rocketLinkBook);
 
 		// Book looping closed
-		_rocketLinkBook = _vm->_video->playBackgroundMovie(movieFile, 224, 41, true);
+		_rocketLinkBook = _vm->_video->playMovie(movieFile, 224, 41, true);
 		_vm->_video->setVideoBounds(_rocketLinkBook, Graphics::VideoTimestamp(660, 600), Graphics::VideoTimestamp(3500, 600));
 
 		_tempVar = 1;
@@ -2847,7 +2847,7 @@ void MystScriptParser_Myst::clockGearForwardOneStep(uint16 gear) {
 
 	// Set video bounds
 	uint16 gearPosition = _clockGearsPositions[gear] - 1;
-	_clockGearsVideos[gear] = _vm->_video->playBackgroundMovie(_vm->wrapMovieFilename(videos[gear], kMystStack), x[gear], y[gear]);
+	_clockGearsVideos[gear] = _vm->_video->playMovie(_vm->wrapMovieFilename(videos[gear], kMystStack), x[gear], y[gear]);
 	_vm->_video->setVideoBounds(_clockGearsVideos[gear],
 			Graphics::VideoTimestamp(startTime[gearPosition], 600),
 			Graphics::VideoTimestamp(endTime[gearPosition], 600));
@@ -2855,7 +2855,7 @@ void MystScriptParser_Myst::clockGearForwardOneStep(uint16 gear) {
 
 void MystScriptParser_Myst::clockWeightDownOneStep() {
 	// Set video bounds
-	_clockWeightVideo = _vm->_video->playBackgroundMovie(_vm->wrapMovieFilename("cl1wlfch", kMystStack) , 124, 0);
+	_clockWeightVideo = _vm->_video->playMovie(_vm->wrapMovieFilename("cl1wlfch", kMystStack) , 124, 0);
 	_vm->_video->setVideoBounds(_clockWeightVideo,
 			Graphics::VideoTimestamp(_clockWeightPosition, 600),
 			Graphics::VideoTimestamp(_clockWeightPosition + 246, 600));
@@ -2917,7 +2917,7 @@ void MystScriptParser_Myst::clockGearsCheckSolution() {
 
 		// Make weight go down
 		_vm->_sound->replaceSound(9113);
-		_clockWeightVideo = _vm->_video->playBackgroundMovie(_vm->wrapMovieFilename("cl1wlfch", kMystStack) , 124, 0);
+		_clockWeightVideo = _vm->_video->playMovie(_vm->wrapMovieFilename("cl1wlfch", kMystStack) , 124, 0);
 		_vm->_video->setVideoBounds(_clockWeightVideo,
 				Graphics::VideoTimestamp(_clockWeightPosition, 600),
 				Graphics::VideoTimestamp(2214, 600));
@@ -2929,7 +2929,7 @@ void MystScriptParser_Myst::clockGearsCheckSolution() {
 		_vm->_sound->replaceSound(7113);
 
 		// Gear opening video
-		_vm->_video->playMovie(_vm->wrapMovieFilename("cl1wggat", kMystStack) , 195, 225);
+		_vm->_video->playMovieBlocking(_vm->wrapMovieFilename("cl1wggat", kMystStack) , 195, 225);
 		_state.gearsOpen = 1;
 		_vm->redrawArea(40);
 
@@ -3003,7 +3003,7 @@ void MystScriptParser_Myst::clockReset() {
 void MystScriptParser_Myst::clockResetWeight() {
 	// Set video bounds, weight going up
 	if (!(_vm->getFeatures() & GF_ME)) {
-		_clockWeightVideo = _vm->_video->playBackgroundMovie(_vm->wrapMovieFilename("cl1wlfch", kMystStack) , 124, 0);
+		_clockWeightVideo = _vm->_video->playMovie(_vm->wrapMovieFilename("cl1wlfch", kMystStack) , 124, 0);
 		_vm->_video->setVideoBounds(_clockWeightVideo,
 				Graphics::VideoTimestamp(2214 * 2 - _clockWeightPosition, 600),
 				Graphics::VideoTimestamp(2214 * 2, 600));
@@ -3025,7 +3025,7 @@ void MystScriptParser_Myst::clockResetGear(uint16 gear) {
 	// Set video bounds, gears going to 3
 	uint16 gearPosition = _clockGearsPositions[gear] - 1;
 	if (gearPosition != 2) {
-		_clockGearsVideos[gear] = _vm->_video->playBackgroundMovie(_vm->wrapMovieFilename(videos[gear], kMystStack), x[gear], y[gear]);
+		_clockGearsVideos[gear] = _vm->_video->playMovie(_vm->wrapMovieFilename(videos[gear], kMystStack), x[gear], y[gear]);
 		_vm->_video->setVideoBounds(_clockGearsVideos[gear],
 				Graphics::VideoTimestamp(time[gearPosition], 600),
 				Graphics::VideoTimestamp(time[2], 600));
@@ -3354,7 +3354,7 @@ void MystScriptParser_Myst::gullsFly1_run() {
 			else
 				x = _vm->_rnd->getRandomNumber(160) + 260;
 
-			_vm->_video->playBackgroundMovie(_vm->wrapMovieFilename(gulls[video], kMystStack), x, 0);
+			_vm->_video->playMovie(_vm->wrapMovieFilename(gulls[video], kMystStack), x, 0);
 
 			_gullsNextTime = time + _vm->_rnd->getRandomNumber(16667) + 13334;
 		}
@@ -3500,7 +3500,7 @@ void MystScriptParser_Myst::gullsFly2_run() {
 	if (time > _gullsNextTime) {
 		uint16 video = _vm->_rnd->getRandomNumber(3);
 		if (video != 3) {
-			_vm->_video->playBackgroundMovie(_vm->wrapMovieFilename(gulls[video], kMystStack), 424, 0);
+			_vm->_video->playMovie(_vm->wrapMovieFilename(gulls[video], kMystStack), 424, 0);
 
 			_gullsNextTime = time + _vm->_rnd->getRandomNumber(16667) + 13334;
 		}
@@ -3529,15 +3529,15 @@ void MystScriptParser_Myst::opcode_218(uint16 op, uint16 var, uint16 argc, uint1
 	// Used for Card 4097 (Cabin Boiler)
 	// TODO: Fill in logic
 	if (false) {
-		_vm->_video->playMovie(_vm->wrapMovieFilename("cabfirfr", kMystStack), 254, 244);
-		_vm->_video->playMovie(_vm->wrapMovieFilename("cabcgfar", kMystStack), 254, 138);
+		_vm->_video->playMovieBlocking(_vm->wrapMovieFilename("cabfirfr", kMystStack), 254, 244);
+		_vm->_video->playMovieBlocking(_vm->wrapMovieFilename("cabcgfar", kMystStack), 254, 138);
 	}
 
 	// Used for Card 4098 (Cabin Boiler)
 	// TODO: Fill in logic
 	if (false) {
-		_vm->_video->playMovie(_vm->wrapMovieFilename("cabfire", kMystStack), 240, 279);
-		_vm->_video->playMovie(_vm->wrapMovieFilename("cabingau", kMystStack), 243, 97);
+		_vm->_video->playMovieBlocking(_vm->wrapMovieFilename("cabfire", kMystStack), 240, 279);
+		_vm->_video->playMovieBlocking(_vm->wrapMovieFilename("cabingau", kMystStack), 243, 97);
 	}
 }
 
@@ -3596,14 +3596,14 @@ void MystScriptParser_Myst::greenBook_run() {
 
 		if (_globals.ending != 4) {
 			_tempVar = 2;
-			_vm->_video->playBackgroundMovie(file, 314, 76);
+			_vm->_video->playMovie(file, 314, 76);
 		} else {
-			VideoHandle book = _vm->_video->playBackgroundMovie(file, 314, 76, true);
+			VideoHandle book = _vm->_video->playMovie(file, 314, 76, true);
 			_vm->_video->setVideoBounds(book, Graphics::VideoTimestamp(loopStart, 600), Graphics::VideoTimestamp(loopEnd, 600));
 			_tempVar = 0;
 		}
 	} else if (_tempVar == 2 && !_vm->_video->isVideoPlaying()) {
-		VideoHandle book = _vm->_video->playBackgroundMovie(file, 314, 76);
+		VideoHandle book = _vm->_video->playMovie(file, 314, 76);
 		_vm->_video->setVideoBounds(book, Graphics::VideoTimestamp(loopStart, 600), Graphics::VideoTimestamp(loopEnd, 600));
 		_vm->_video->setVideoLooping(book, true);
 		_tempVar = 0;
@@ -3628,7 +3628,7 @@ void MystScriptParser_Myst::gullsFly3_run() {
 		if (video != 3) {
 			uint16 x = _vm->_rnd->getRandomNumber(280) + 135;
 
-			_vm->_video->playBackgroundMovie(_vm->wrapMovieFilename(gulls[video], kMystStack), x, 0);
+			_vm->_video->playMovie(_vm->wrapMovieFilename(gulls[video], kMystStack), x, 0);
 
 			_gullsNextTime = time + _vm->_rnd->getRandomNumber(16667) + 13334;
 		}
diff --git a/engines/mohawk/myst_stacks/selenitic.cpp b/engines/mohawk/myst_stacks/selenitic.cpp
index 1fd76480c0..ab932a87a7 100644
--- a/engines/mohawk/myst_stacks/selenitic.cpp
+++ b/engines/mohawk/myst_stacks/selenitic.cpp
@@ -482,7 +482,7 @@ void MystScriptParser_Selenitic::mazeRunnerPlayVideo(uint16 video, uint16 pos) {
 
 	if (!file.empty()) {
 		const Common::Rect &dest = _mazeRunnerWindow->getRect();
-		_vm->_video->playMovie(file, dest.left, dest.top, false);
+		_vm->_video->playMovieBlocking(file, dest.left, dest.top, false);
 	}
 }
 
diff --git a/engines/mohawk/myst_stacks/stoneship.cpp b/engines/mohawk/myst_stacks/stoneship.cpp
index 90c6ea247f..c20b13960d 100644
--- a/engines/mohawk/myst_stacks/stoneship.cpp
+++ b/engines/mohawk/myst_stacks/stoneship.cpp
@@ -219,7 +219,7 @@ void MystScriptParser_Stoneship::opcode_102(uint16 op, uint16 var, uint16 argc,
 		warning("TODO: Opcode %d Movie Time Index %d to %d", op, startTime, endTime);
 		// TODO: Need version of playMovie blocking which allows selection
 		//       of start and finish points.
-		_vm->_video->playMovie(_vm->wrapMovieFilename("bkroom", kStoneshipStack), 159, 99);
+		_vm->_video->playMovieBlocking(_vm->wrapMovieFilename("bkroom", kStoneshipStack), 159, 99);
 	} else
 		unknown(op, var, argc, argv);
 }
@@ -329,7 +329,7 @@ void MystScriptParser_Stoneship::opcode_117(uint16 op, uint16 var, uint16 argc,
 		// Called when Valve Hotspot Clicked.
 		// TODO: Fill in Function to play right section of movie
 		//       based on valve state and water in chest..
-		_vm->_video->playMovie(_vm->wrapMovieFilename("ligspig", kStoneshipStack), 97, 267);
+		_vm->_video->playMovieBlocking(_vm->wrapMovieFilename("ligspig", kStoneshipStack), 97, 267);
 	} else
 		unknown(op, var, argc, argv);
 }
@@ -352,7 +352,7 @@ void MystScriptParser_Stoneship::opcode_119(uint16 op, uint16 var, uint16 argc,
 	if (argc == 0) {
 		// Used on Card 2143 (Lighthouse Trapdoor)
 		// Called when Lock Hotspot Clicked while holding key.
-		_vm->_video->playMovie(_vm->wrapMovieFilename("openloc", kStoneshipStack), 187, 72);
+		_vm->_video->playMovieBlocking(_vm->wrapMovieFilename("openloc", kStoneshipStack), 187, 72);
 	} else
 		unknown(op, var, argc, argv);
 }
@@ -370,19 +370,19 @@ void MystScriptParser_Stoneship::opcode_120(uint16 op, uint16 var, uint16 argc,
 		switch (movieId) {
 		case 0:
 			// Card 2251
-			_vm->_video->playMovie(_vm->wrapMovieFilename("tunaup", kStoneshipStack), 149, 161);
+			_vm->_video->playMovieBlocking(_vm->wrapMovieFilename("tunaup", kStoneshipStack), 149, 161);
 			break;
 		case 1:
 			// Card 2247
-			_vm->_video->playMovie(_vm->wrapMovieFilename("tunadown", kStoneshipStack), 218, 150);
+			_vm->_video->playMovieBlocking(_vm->wrapMovieFilename("tunadown", kStoneshipStack), 218, 150);
 			break;
 		case 2:
 			// Card 2289
-			_vm->_video->playMovie(_vm->wrapMovieFilename("tuncup", kStoneshipStack), 259, 161);
+			_vm->_video->playMovieBlocking(_vm->wrapMovieFilename("tuncup", kStoneshipStack), 259, 161);
 			break;
 		case 3:
 			// Card 2285
-			_vm->_video->playMovie(_vm->wrapMovieFilename("tuncdown", kStoneshipStack), 166, 150);
+			_vm->_video->playMovieBlocking(_vm->wrapMovieFilename("tuncdown", kStoneshipStack), 166, 150);
 			break;
 		default:
 			warning("Opcode 120 MovieId Out Of Range");