aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--graphics/video/coktel_decoder.h13
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);