[Scummvm-cvs-logs] SF.net SVN: scummvm:[46710] scummvm/trunk/graphics/video/coktelvideo

[drmccoy at users.sourceforge.net]

Revision: 46710
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46710&view=rev
Author:   drmccoy
Date:     2009-12-29 17:10:14 +0000 (Tue, 29 Dec 2009)

Log Message:
-----------
Adding CoktelVideo::hasExtraData(void), for checking if /any/ extra data files are embedded in the video file

Modified Paths:
--------------
    scummvm/trunk/graphics/video/coktelvideo/coktelvideo.cpp
    scummvm/trunk/graphics/video/coktelvideo/coktelvideo.h

Modified: scummvm/trunk/graphics/video/coktelvideo/coktelvideo.cpp
===================================================================
--- scummvm/trunk/graphics/video/coktelvideo/coktelvideo.cpp	2009-12-29 16:58:54 UTC (rev 46709)
+++ scummvm/trunk/graphics/video/coktelvideo/coktelvideo.cpp	2009-12-29 17:10:14 UTC (rev 46710)
@@ -96,6 +96,10 @@
 	return false;
 }
 
+bool Imd::hasExtraData() const {
+	return false;
+}
+
 bool Imd::hasExtraData(const char *fileName) const {
 	return false;
 }
@@ -2273,6 +2277,10 @@
 	return getPartCoords(frame, kPartTypeVideo, x, y, width, height);
 }
 
+bool Vmd::hasExtraData() const {
+	return !_extraData.empty();
+}
+
 bool Vmd::hasExtraData(const char *fileName) const {
 	for (uint i = 0; i < _extraData.size(); i++)
 		if (!scumm_stricmp(_extraData[i].name, fileName))

Modified: scummvm/trunk/graphics/video/coktelvideo/coktelvideo.h
===================================================================
--- scummvm/trunk/graphics/video/coktelvideo/coktelvideo.h	2009-12-29 16:58:54 UTC (rev 46709)
+++ scummvm/trunk/graphics/video/coktelvideo/coktelvideo.h	2009-12-29 17:10:14 UTC (rev 46710)
@@ -141,6 +141,8 @@
 	virtual bool getFrameCoords(int16 frame,
 			int16 &x, int16 &y, int16 &width, int16 &height) = 0;
 
+	/** Returns whether any extra data files are embedded in this video. */
+	virtual bool hasExtraData() const = 0;
 	/** Returns whether that extra data file exists */
 	virtual bool hasExtraData(const char *fileName) const = 0;
 	/** Returns an extra data file */
@@ -227,6 +229,7 @@
 	bool getFrameCoords(int16 frame,
 			int16 &x, int16 &y, int16 &width, int16 &height);
 
+	bool hasExtraData() const;
 	bool hasExtraData(const char *fileName) const;
 	Common::MemoryReadStream *getExtraData(const char *fileName);
 
@@ -388,6 +391,7 @@
 	bool getFrameCoords(int16 frame,
 			int16 &x, int16 &y, int16 &width, int16 &height);
 
+	bool hasExtraData() const;
 	bool hasExtraData(const char *fileName) const;
 	Common::MemoryReadStream *getExtraData(const char *fileName);
 


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