aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorSven Hesse2010-08-08 00:46:34 +0000
committerSven Hesse2010-08-08 00:46:34 +0000
commit737ef0270718c2f7fb92784f337a308967d57ce3 (patch)
tree238f83e71ed603738bd9eadb33a10365c8b9599c /engines
parent933ffcaa60e8eea09054038887f9dcd2e2772473 (diff)
downloadscummvm-rg350-737ef0270718c2f7fb92784f337a308967d57ce3.tar.gz
scummvm-rg350-737ef0270718c2f7fb92784f337a308967d57ce3.tar.bz2
scummvm-rg350-737ef0270718c2f7fb92784f337a308967d57ce3.zip
VIDEO/GOB: Stub hasEmbeddedFile / getEmbeddedFile
Stubbing CoktelDecoder::hasEmbeddedFile() and CoktelDecoder::getEmbeddedFile(), formerly hasExtraData/getExtraData. svn-id: r51875
Diffstat (limited to 'engines')
-rw-r--r--engines/gob/totfile.cpp2
-rw-r--r--engines/gob/videoplayer.cpp8
-rw-r--r--engines/gob/videoplayer.h4
3 files changed, 7 insertions, 7 deletions
diff --git a/engines/gob/totfile.cpp b/engines/gob/totfile.cpp
index 5cc723ba7d..178deeaf58 100644
--- a/engines/gob/totfile.cpp
+++ b/engines/gob/totfile.cpp
@@ -49,7 +49,7 @@ bool TOTFile::load(const Common::String &fileName) {
if (!_stream)
// Trying to open from video
- _stream = _vm->_vidPlayer->getExtraData(fileName.c_str());
+ _stream = _vm->_vidPlayer->getEmbeddedFile(fileName.c_str());
if (!_stream)
return false;
diff --git a/engines/gob/videoplayer.cpp b/engines/gob/videoplayer.cpp
index 4dcf49fb86..b219d341da 100644
--- a/engines/gob/videoplayer.cpp
+++ b/engines/gob/videoplayer.cpp
@@ -442,20 +442,20 @@ uint16 VideoPlayer::getDefaultY(int slot) const {
return video->decoder->getDefaultY();
}
-bool VideoPlayer::hasExtraData(const Common::String &fileName, int slot) const {
+bool VideoPlayer::hasEmbeddedFile(const Common::String &fileName, int slot) const {
const Video *video = getVideoBySlot(slot);
if (!video)
return false;
- return false; // video->decoder->hasExtraData(fileName);
+ return video->decoder->hasEmbeddedFile(fileName);
}
-Common::MemoryReadStream *VideoPlayer::getExtraData(const Common::String &fileName, int slot) {
+Common::MemoryReadStream *VideoPlayer::getEmbeddedFile(const Common::String &fileName, int slot) {
const Video *video = getVideoBySlot(slot);
if (!video)
return 0;
- return 0; // video->decoder->getExtraData(fileName);
+ return video->decoder->getEmbeddedFile(fileName);
}
void VideoPlayer::writeVideoInfo(const Common::String &file, int16 varX, int16 varY,
diff --git a/engines/gob/videoplayer.h b/engines/gob/videoplayer.h
index 04c55f84cd..b932807d65 100644
--- a/engines/gob/videoplayer.h
+++ b/engines/gob/videoplayer.h
@@ -111,8 +111,8 @@ public:
uint16 getDefaultX (int slot = 0) const;
uint16 getDefaultY (int slot = 0) const;
- bool hasExtraData(const Common::String &fileName, int slot = 0) const;
- Common::MemoryReadStream *getExtraData(const Common::String &fileName, int slot = 0);
+ bool hasEmbeddedFile(const Common::String &fileName, int slot = 0) const;
+ Common::MemoryReadStream *getEmbeddedFile(const Common::String &fileName, int slot = 0);
void writeVideoInfo(const Common::String &file, int16 varX, int16 varY,
int16 varFrames, int16 varWidth, int16 varHeight);