diff options
| author | Matthew Hoops | 2012-07-22 14:11:11 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2012-07-22 14:11:11 -0400 |
| commit | 7654b2036268bb56f3b08b88858f2a9e4862b056 (patch) | |
| tree | d7a734ec0076d3dd771cd52f78993a2da159c96e /video/video_decoder.cpp | |
| parent | 29541dc5f4dd492f7443463f709a5c6396dab9d8 (diff) | |
| download | scummvm-rg350-7654b2036268bb56f3b08b88858f2a9e4862b056.tar.gz scummvm-rg350-7654b2036268bb56f3b08b88858f2a9e4862b056.tar.bz2 scummvm-rg350-7654b2036268bb56f3b08b88858f2a9e4862b056.zip | |
VIDEO: Merge the three Fixed* VideoTrack classes
Avoids diamond inheritance, which makes it impossible to downcast without rtti
Diffstat (limited to 'video/video_decoder.cpp')
| -rw-r--r-- | video/video_decoder.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/video/video_decoder.cpp b/video/video_decoder.cpp index b2fcdda04c..ad176da73b 100644 --- a/video/video_decoder.cpp +++ b/video/video_decoder.cpp @@ -400,11 +400,11 @@ uint32 AdvancedVideoDecoder::FixedRateVideoTrack::getNextFrameStartTime() const return time.toInt(); } -bool AdvancedVideoDecoder::FixedLengthVideoTrack::endOfTrack() const { +bool AdvancedVideoDecoder::FixedRateVideoTrack::endOfTrack() const { return getCurFrame() >= (getFrameCount() - 1); } -Audio::Timestamp AdvancedVideoDecoder::FixedDurationVideoTrack::getDuration() const { +Audio::Timestamp AdvancedVideoDecoder::FixedRateVideoTrack::getDuration() const { // Since Audio::Timestamp doesn't support a fractional frame rate, we're currently // just converting to milliseconds. Common::Rational time = getFrameCount() * 1000; |