diff options
author | Matthew Hoops | 2010-05-17 21:59:05 +0000 |
---|---|---|
committer | Matthew Hoops | 2010-05-17 21:59:05 +0000 |
commit | c7fa1074fbc55e9e519f9c7e08dea9603af22e61 (patch) | |
tree | 502ce42530df3ea513eebf7096dfc72bf05a3dd7 /graphics/video/video_player.h | |
parent | ea84abf5880f0af2642dd3de08a6d9c6f7f88426 (diff) | |
download | scummvm-rg350-c7fa1074fbc55e9e519f9c7e08dea9603af22e61.tar.gz scummvm-rg350-c7fa1074fbc55e9e519f9c7e08dea9603af22e61.tar.bz2 scummvm-rg350-c7fa1074fbc55e9e519f9c7e08dea9603af22e61.zip |
Change VideoDecoder::getCurFrame() to mean the last frame drawn instead of the next frame to draw. This is patch 1 from patch #2963496 (VideoDecoder Rewrite).
svn-id: r49063
Diffstat (limited to 'graphics/video/video_player.h')
-rw-r--r-- | graphics/video/video_player.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/graphics/video/video_player.h b/graphics/video/video_player.h index 333c39f700..4f38bd9740 100644 --- a/graphics/video/video_player.h +++ b/graphics/video/video_player.h @@ -60,13 +60,13 @@ public: * Returns the current frame number of the video * @return the current frame number of the video */ - virtual int32 getCurFrame(); + virtual int32 getCurFrame() const; /** * Returns the amount of frames in the video * @return the amount of frames in the video */ - virtual int32 getFrameCount(); + virtual int32 getFrameCount() const; /** * Returns the frame rate of the video @@ -108,7 +108,7 @@ public: /** * Returns if a video file is loaded or not */ - bool isVideoLoaded() { return (_fileStream != NULL); } + bool isVideoLoaded() const { return (_fileStream != NULL); } /** * Set RGB palette, based on current frame @@ -158,6 +158,11 @@ public: */ virtual bool decodeNextFrame() = 0; + /** + * Returns if the video is finished or not + */ + virtual bool endOfVideo() const; + protected: struct { uint32 width; @@ -166,7 +171,7 @@ protected: int32 frameRate; int32 frameDelay; // 1/100 ms (to avoid rounding errors) uint32 firstframeOffset; - uint32 currentFrame; + int32 currentFrame; uint32 startTime; } _videoInfo; |