OPENGL: Merged from trunk, from rev 52105 to 53396.

This includes an rather hacky attempt to merge all the recent gp2x backend
changes into the branch. I suppose the gp2x backend and probably all new
backends, i.e. gph, dingux etc., might not compile anymore.

Since I have no way of testing those it would be nice if porters could look
into getting those up to speed in this branch.

svn-id: r53399

1 files changed, 14 insertions, 4 deletions

diff --git a/engines/mohawk/video.cpp b/engines/mohawk/video.cpp
index 17456b8ec3..b7ee4c8a2c 100644
--- a/engines/mohawk/video.cpp
+++ b/engines/mohawk/video.cpp
@@ -123,7 +123,7 @@ void VideoManager::waitUntilMovieEnds(VideoHandle videoHandle) {
 
 	delete _videoStreams[videoHandle].video;
 	_videoStreams[videoHandle].video = 0;
-	_videoStreams[videoHandle].id = 0;
+	_videoStreams[videoHandle].id = 0xffff;
 	_videoStreams[videoHandle].filename.clear();
 }
 
@@ -156,7 +156,7 @@ bool VideoManager::updateBackgroundMovies() {
 			} else {
 				delete _videoStreams[i].video;
 				_videoStreams[i].video = 0;
-				_videoStreams[i].id = 0;
+				_videoStreams[i].id = 0xffff;
 				_videoStreams[i].filename.clear();
 				continue;
 			}
@@ -292,7 +292,7 @@ void VideoManager::stopMovie(uint16 id) {
 				if (_mlstRecords[i].movieID == _videoStreams[j].id) {
 					delete _videoStreams[j].video;
 					_videoStreams[j].video = 0;
-					_videoStreams[j].id = 0;
+					_videoStreams[j].id = 0xffff;
 					_videoStreams[j].filename.clear();
 					return;
 				}
@@ -368,7 +368,7 @@ VideoHandle VideoManager::createVideoHandle(Common::String filename, uint16 x, u
 	entry.x = x;
 	entry.y = y;
 	entry.filename = filename;
-	entry.id = 0;
+	entry.id = 0xffff;
 	entry.loop = loop;
 	entry.enabled = true;
 	
@@ -412,4 +412,14 @@ uint32 VideoManager::getFrameCount(const VideoHandle &handle) {
 	return _videoStreams[handle]->getFrameCount();
 }
 
+uint32 VideoManager::getElapsedTime(const VideoHandle &handle) {
+	assert(handle != NULL_VID_HANDLE);
+	return _videoStreams[handle]->getElapsedTime();
+}
+
+bool VideoManager::endOfVideo(const VideoHandle &handle) {
+	assert(handle != NULL_VID_HANDLE);
+	return _videoStreams[handle]->endOfVideo();
+}
+
 } // End of namespace Mohawk