[Scummvm-cvs-logs] SF.net SVN: scummvm:[51900] scummvm/trunk

[drmccoy at users.sourceforge.net]

Revision: 51900
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51900&view=rev
Author:   drmccoy
Date:     2010-08-08 00:58:00 +0000 (Sun, 08 Aug 2010)

Log Message:
-----------
VIDEO: Fix compilation after the VideoDecoder::load signature change in r51725

Modified Paths:
--------------
    scummvm/trunk/engines/gob/videoplayer.cpp
    scummvm/trunk/graphics/video/coktel_decoder.cpp
    scummvm/trunk/graphics/video/coktel_decoder.h

Modified: scummvm/trunk/engines/gob/videoplayer.cpp
===================================================================
--- scummvm/trunk/engines/gob/videoplayer.cpp	2010-08-08 00:57:27 UTC (rev 51899)
+++ scummvm/trunk/engines/gob/videoplayer.cpp	2010-08-08 00:58:00 UTC (rev 51900)
@@ -690,7 +690,7 @@
 		return 0;
 	}
 
-	if (!video->load(*stream)) {
+	if (!video->load(stream)) {
 		delete video;
 		return 0;
 	}

Modified: scummvm/trunk/graphics/video/coktel_decoder.cpp
===================================================================
--- scummvm/trunk/graphics/video/coktel_decoder.cpp	2010-08-08 00:57:27 UTC (rev 51899)
+++ scummvm/trunk/graphics/video/coktel_decoder.cpp	2010-08-08 00:58:00 UTC (rev 51900)
@@ -539,14 +539,14 @@
 	return true;
 }
 
-bool PreIMDDecoder::load(Common::SeekableReadStream &stream) {
+bool PreIMDDecoder::load(Common::SeekableReadStream *stream) {
 	// Since PreIMDs don't have any width and height values stored,
 	// we need them to be specified in the constructor
 	assert((_width > 0) && (_height > 0));
 
 	close();
 
-	_stream = &stream;
+	_stream = stream;
 
 	_stream->seek(0);
 
@@ -791,10 +791,10 @@
 		_y = y;
 }
 
-bool IMDDecoder::load(Common::SeekableReadStream &stream) {
+bool IMDDecoder::load(Common::SeekableReadStream *stream) {
 	close();
 
-	_stream = &stream;
+	_stream = stream;
 
 	uint16 handle;
 
@@ -1410,10 +1410,10 @@
 	return true;
 }
 
-bool VMDDecoder::load(Common::SeekableReadStream &stream) {
+bool VMDDecoder::load(Common::SeekableReadStream *stream) {
 	close();
 
-	_stream = &stream;
+	_stream = stream;
 
 	_stream->seek(0);
 

Modified: scummvm/trunk/graphics/video/coktel_decoder.h
===================================================================
--- scummvm/trunk/graphics/video/coktel_decoder.h	2010-08-08 00:57:27 UTC (rev 51899)
+++ scummvm/trunk/graphics/video/coktel_decoder.h	2010-08-08 00:58:00 UTC (rev 51900)
@@ -214,7 +214,7 @@
 
 	// VideoDecoder interface
 
-	bool load(Common::SeekableReadStream &stream);
+	bool load(Common::SeekableReadStream *stream);
 	void close();
 
 	bool isVideoLoaded() const;
@@ -247,7 +247,7 @@
 
 	// VideoDecoder interface
 
-	bool load(Common::SeekableReadStream &stream);
+	bool load(Common::SeekableReadStream *stream);
 	void close();
 
 	bool isVideoLoaded() const;
@@ -346,7 +346,7 @@
 
 	// VideoDecoder interface
 
-	bool load(Common::SeekableReadStream &stream);
+	bool load(Common::SeekableReadStream *stream);
 	void close();
 
 	bool isVideoLoaded() const;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.