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

[drmccoy at users.sourceforge.net]

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

Log Message:
-----------
VIDEO/GOB: Stub hasEmbeddedFile / getEmbeddedFile

Stubbing CoktelDecoder::hasEmbeddedFile() and
CoktelDecoder::getEmbeddedFile(), formerly hasExtraData/getExtraData.

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

Modified: scummvm/trunk/engines/gob/totfile.cpp
===================================================================
--- scummvm/trunk/engines/gob/totfile.cpp	2010-08-08 00:45:58 UTC (rev 51874)
+++ scummvm/trunk/engines/gob/totfile.cpp	2010-08-08 00:46:34 UTC (rev 51875)
@@ -49,7 +49,7 @@
 
 	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;

Modified: scummvm/trunk/engines/gob/videoplayer.cpp
===================================================================
--- scummvm/trunk/engines/gob/videoplayer.cpp	2010-08-08 00:45:58 UTC (rev 51874)
+++ scummvm/trunk/engines/gob/videoplayer.cpp	2010-08-08 00:46:34 UTC (rev 51875)
@@ -442,20 +442,20 @@
 	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,

Modified: scummvm/trunk/engines/gob/videoplayer.h
===================================================================
--- scummvm/trunk/engines/gob/videoplayer.h	2010-08-08 00:45:58 UTC (rev 51874)
+++ scummvm/trunk/engines/gob/videoplayer.h	2010-08-08 00:46:34 UTC (rev 51875)
@@ -111,8 +111,8 @@
 	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);

Modified: scummvm/trunk/graphics/video/coktel_decoder.cpp
===================================================================
--- scummvm/trunk/graphics/video/coktel_decoder.cpp	2010-08-08 00:45:58 UTC (rev 51874)
+++ scummvm/trunk/graphics/video/coktel_decoder.cpp	2010-08-08 00:46:34 UTC (rev 51875)
@@ -169,6 +169,14 @@
 	_audioStream  = 0;
 }
 
+bool CoktelDecoder::hasEmbeddedFile(const Common::String &fileName) const {
+	return false;
+}
+
+Common::MemoryReadStream *CoktelDecoder::getEmbeddedFile(const Common::String &fileName) const {
+	return 0;
+}
+
 void CoktelDecoder::close() {
 	disableSound();
 	freeSurface();

Modified: scummvm/trunk/graphics/video/coktel_decoder.h
===================================================================
--- scummvm/trunk/graphics/video/coktel_decoder.h	2010-08-08 00:45:58 UTC (rev 51874)
+++ scummvm/trunk/graphics/video/coktel_decoder.h	2010-08-08 00:46:34 UTC (rev 51875)
@@ -93,7 +93,12 @@
 	void enableSound();
 	void disableSound();
 
+	/** Return whether that embedded file exists. */
+	virtual bool hasEmbeddedFile(const Common::String &fileName) const;
 
+	/** Return that embedded file. */
+	virtual Common::MemoryReadStream *getEmbeddedFile(const Common::String &fileName) const;
+
 	// VideoDecoder interface
 
 	void close();


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