diff options
| author | Sven Hesse | 2010-08-08 00:45:58 +0000 |
|---|---|---|
| committer | Sven Hesse | 2010-08-08 00:45:58 +0000 |
| commit | 933ffcaa60e8eea09054038887f9dcd2e2772473 (patch) | |
| tree | 50eef269be731e43bb52defbaf77b10af9babf27 /graphics/video | |
| parent | f956f059e3fcdbf4da29f6f5ecec2339f5b89e78 (diff) | |
| download | scummvm-rg350-933ffcaa60e8eea09054038887f9dcd2e2772473.tar.gz scummvm-rg350-933ffcaa60e8eea09054038887f9dcd2e2772473.tar.bz2 scummvm-rg350-933ffcaa60e8eea09054038887f9dcd2e2772473.zip | |
VIDEO: Make getFrameRate() protected again
svn-id: r51874
Diffstat (limited to 'graphics/video')
| -rw-r--r-- | graphics/video/coktel_decoder.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/graphics/video/coktel_decoder.h b/graphics/video/coktel_decoder.h index 9921fbd28c..a8449a25ac 100644 --- a/graphics/video/coktel_decoder.h +++ b/graphics/video/coktel_decoder.h @@ -93,6 +93,7 @@ public: void enableSound(); void disableSound(); + // VideoDecoder interface void close(); @@ -105,6 +106,11 @@ public: byte *getPalette(); bool hasDirtyPalette() const; + + // FixedRateVideoDecoder interface + + uint32 getTimeToNextFrame() const; + protected: enum SoundStage { kSoundNone = 0, ///< No sound. @@ -171,11 +177,10 @@ protected: inline void unsignedToSigned(byte *buffer, int length); -public: + // FixedRateVideoDecoder interface - Common::Rational getFrameRate() const; - uint32 getTimeToNextFrame() const; + Common::Rational getFrameRate() const; }; class PreIMDDecoder : public CoktelDecoder { @@ -186,6 +191,7 @@ public: bool seek(int32 frame, int whence = SEEK_SET, bool restart = false); + // VideoDecoder interface bool load(Common::SeekableReadStream &stream); @@ -217,6 +223,7 @@ public: void setXY(uint16 x, uint16 y); + // VideoDecoder interface bool load(Common::SeekableReadStream &stream); |