From 9e330174c8b8a0d2574746f1bc055423be263311 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Sat, 12 May 2012 21:28:13 -0400
Subject: VIDEO: Change getElapsedTime() into getTime()

This name change accompanies a slight meaning change; now it means the current time position from the beginning of the video and not from starting the video.
---
 engines/mohawk/myst_stacks/dni.cpp | 2 +-
 engines/mohawk/riven.cpp           | 2 +-
 engines/mohawk/riven_external.cpp  | 4 ++--
 engines/mohawk/video.cpp           | 6 +++---
 engines/mohawk/video.h             | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'engines/mohawk')

diff --git a/engines/mohawk/myst_stacks/dni.cpp b/engines/mohawk/myst_stacks/dni.cpp
index 2ced265f02..cae165ccf0 100644
--- a/engines/mohawk/myst_stacks/dni.cpp
+++ b/engines/mohawk/myst_stacks/dni.cpp
@@ -103,7 +103,7 @@ void Dni::o_handPage(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	VideoHandle atrus = _vm->_video->findVideoHandle(_video);
 
 	// Good ending and Atrus asked to give page
-	if (_globals.ending == 1 && _vm->_video->getElapsedTime(atrus) > (uint)Audio::Timestamp(0, 6801, 600).msecs()) {
+	if (_globals.ending == 1 && _vm->_video->getTime(atrus) > (uint)Audio::Timestamp(0, 6801, 600).msecs()) {
 		_globals.ending = 2;
 		_globals.heldPage = 0;
 		_vm->setMainCursor(kDefaultMystCursor);
diff --git a/engines/mohawk/riven.cpp b/engines/mohawk/riven.cpp
index 95a8313536..07b1b59929 100644
--- a/engines/mohawk/riven.cpp
+++ b/engines/mohawk/riven.cpp
@@ -979,7 +979,7 @@ void MohawkEngine_Riven::doVideoTimer(VideoHandle handle, bool force) {
 		return;
 
 	// Run the opcode if we can at this point
-	if (force || _video->getElapsedTime(handle) >= _scriptMan->getStoredMovieOpcodeTime())
+	if (force || _video->getTime(handle) >= _scriptMan->getStoredMovieOpcodeTime())
 		_scriptMan->runStoredMovieOpcode();
 }
 
diff --git a/engines/mohawk/riven_external.cpp b/engines/mohawk/riven_external.cpp
index 8dfc74ebf0..337a57e3e1 100644
--- a/engines/mohawk/riven_external.cpp
+++ b/engines/mohawk/riven_external.cpp
@@ -2059,7 +2059,7 @@ void RivenExternal::xbookclick(uint16 argc, uint16 *argv) {
 	debug(0, "\tHotspot    = %d -> %d", argv[3], hotspotMap[argv[3] - 1]);
 
 	// Just let the video play while we wait until Gehn opens the trap book for us
-	while (_vm->_video->getElapsedTime(video) < startTime && !_vm->shouldQuit()) {
+	while (_vm->_video->getTime(video) < startTime && !_vm->shouldQuit()) {
 		if (_vm->_video->updateMovies())
 			_vm->_system->updateScreen();
 
@@ -2084,7 +2084,7 @@ void RivenExternal::xbookclick(uint16 argc, uint16 *argv) {
 
 	// OK, Gehn has opened the trap book and has asked us to go in. Let's watch
 	// and see what the player will do...
-	while (_vm->_video->getElapsedTime(video) < endTime && !_vm->shouldQuit()) {
+	while (_vm->_video->getTime(video) < endTime && !_vm->shouldQuit()) {
 		bool updateScreen = _vm->_video->updateMovies();
 
 		Common::Event event;
diff --git a/engines/mohawk/video.cpp b/engines/mohawk/video.cpp
index 80fa4bf9a0..83fca9ac35 100644
--- a/engines/mohawk/video.cpp
+++ b/engines/mohawk/video.cpp
@@ -49,7 +49,7 @@ void VideoEntry::clear() {
 }
 
 bool VideoEntry::endOfVideo() {
-	return !video || video->endOfVideo() || video->getElapsedTime() >= (uint)end.msecs();
+	return !video || video->endOfVideo() || video->getTime() >= (uint)end.msecs();
 }
 
 VideoManager::VideoManager(MohawkEngine* vm) : _vm(vm) {
@@ -481,9 +481,9 @@ uint32 VideoManager::getFrameCount(VideoHandle handle) {
 	return _videoStreams[handle]->getFrameCount();
 }
 
-uint32 VideoManager::getElapsedTime(VideoHandle handle) {
+uint32 VideoManager::getTime(VideoHandle handle) {
 	assert(handle != NULL_VID_HANDLE);
-	return _videoStreams[handle]->getElapsedTime();
+	return _videoStreams[handle]->getTime();
 }
 
 uint32 VideoManager::getDuration(VideoHandle handle) {
diff --git a/engines/mohawk/video.h b/engines/mohawk/video.h
index 34c287497f..8736782d7a 100644
--- a/engines/mohawk/video.h
+++ b/engines/mohawk/video.h
@@ -100,7 +100,7 @@ public:
 	VideoHandle findVideoHandle(const Common::String &filename);
 	int32 getCurFrame(VideoHandle handle);
 	uint32 getFrameCount(VideoHandle handle);
-	uint32 getElapsedTime(VideoHandle handle);
+	uint32 getTime(VideoHandle handle);
 	uint32 getDuration(VideoHandle videoHandle);
 	bool endOfVideo(VideoHandle handle);
 	void setVideoBounds(VideoHandle handle, Audio::Timestamp start, Audio::Timestamp end);
-- 
cgit v1.2.3