aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Hesse2010-08-08 00:58:00 +0000
committerSven Hesse2010-08-08 00:58:00 +0000
commitf447ddb36a2bf8b923083e96b51279d72306d22a (patch)
tree0bb009202f7c380d856fe7ee36bce0bd1ee77096
parentb13afba0536d16c3e37a2a887d582d9eeb42c8d1 (diff)
downloadscummvm-rg350-f447ddb36a2bf8b923083e96b51279d72306d22a.tar.gz
scummvm-rg350-f447ddb36a2bf8b923083e96b51279d72306d22a.tar.bz2
scummvm-rg350-f447ddb36a2bf8b923083e96b51279d72306d22a.zip
VIDEO: Fix compilation after the VideoDecoder::load signature change in r51725
svn-id: r51900
-rw-r--r--engines/gob/videoplayer.cpp2
-rw-r--r--graphics/video/coktel_decoder.cpp12
-rw-r--r--graphics/video/coktel_decoder.h6
3 files changed, 10 insertions, 10 deletions
diff --git a/engines/gob/videoplayer.cpp b/engines/gob/videoplayer.cpp
index 2243468755..16d3a7c6fd 100644
--- a/engines/gob/videoplayer.cpp
+++ b/engines/gob/videoplayer.cpp
@@ -690,7 +690,7 @@ Graphics::CoktelDecoder *VideoPlayer::openVideo(const Common::String &file, Prop
return 0;
}
- if (!video->load(*stream)) {
+ if (!video->load(stream)) {
delete video;
return 0;
}
diff --git a/graphics/video/coktel_decoder.cpp b/graphics/video/coktel_decoder.cpp
index 864904f252..ed2ee2a46a 100644
--- a/graphics/video/coktel_decoder.cpp
+++ b/graphics/video/coktel_decoder.cpp
@@ -539,14 +539,14 @@ bool PreIMDDecoder::seek(int32 frame, int whence, bool restart) {
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 @@ void IMDDecoder::setXY(uint16 x, uint16 y) {
_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 @@ bool VMDDecoder::seek(int32 frame, int whence, bool restart) {
return true;
}
-bool VMDDecoder::load(Common::SeekableReadStream &stream) {
+bool VMDDecoder::load(Common::SeekableReadStream *stream) {
close();
- _stream = &stream;
+ _stream = stream;
_stream->seek(0);
diff --git a/graphics/video/coktel_decoder.h b/graphics/video/coktel_decoder.h
index 442f2b4b5d..4a2be43b13 100644
--- a/graphics/video/coktel_decoder.h
+++ b/graphics/video/coktel_decoder.h
@@ -214,7 +214,7 @@ public:
// VideoDecoder interface
- bool load(Common::SeekableReadStream &stream);
+ bool load(Common::SeekableReadStream *stream);
void close();
bool isVideoLoaded() const;
@@ -247,7 +247,7 @@ public:
// VideoDecoder interface
- bool load(Common::SeekableReadStream &stream);
+ bool load(Common::SeekableReadStream *stream);
void close();
bool isVideoLoaded() const;
@@ -346,7 +346,7 @@ public:
// VideoDecoder interface
- bool load(Common::SeekableReadStream &stream);
+ bool load(Common::SeekableReadStream *stream);
void close();
bool isVideoLoaded() const;