[Scummvm-cvs-logs] SF.net SVN: scummvm:[51874] scummvm/trunk/graphics/video/coktel_decoder.h

[drmccoy at users.sourceforge.net]

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

Log Message:
-----------
VIDEO: Make getFrameRate() protected again

Modified Paths:
--------------
    scummvm/trunk/graphics/video/coktel_decoder.h

Modified: scummvm/trunk/graphics/video/coktel_decoder.h
===================================================================
--- scummvm/trunk/graphics/video/coktel_decoder.h	2010-08-08 00:45:27 UTC (rev 51873)
+++ scummvm/trunk/graphics/video/coktel_decoder.h	2010-08-08 00:45:58 UTC (rev 51874)
@@ -93,6 +93,7 @@
 	void enableSound();
 	void disableSound();
 
+
 	// VideoDecoder interface
 
 	void close();
@@ -105,6 +106,11 @@
 	byte *getPalette();
 	bool  hasDirtyPalette() const;
 
+
+	// FixedRateVideoDecoder interface
+
+	uint32 getTimeToNextFrame() const;
+
 protected:
 	enum SoundStage {
 		kSoundNone    = 0, ///< No sound.
@@ -171,11 +177,10 @@
 
 	inline void unsignedToSigned(byte *buffer, int length);
 
-public:
+
 	// FixedRateVideoDecoder interface
+
 	Common::Rational getFrameRate() const;
-
-	uint32 getTimeToNextFrame() const;
 };
 
 class PreIMDDecoder : public CoktelDecoder {
@@ -186,6 +191,7 @@
 
 	bool seek(int32 frame, int whence = SEEK_SET, bool restart = false);
 
+
 	// VideoDecoder interface
 
 	bool load(Common::SeekableReadStream &stream);
@@ -217,6 +223,7 @@
 
 	void setXY(uint16 x, uint16 y);
 
+
 	// VideoDecoder interface
 
 	bool load(Common::SeekableReadStream &stream);


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