libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-31 07:53:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

VIDEO: Remove Track::getStartTime()

Browse Source 
That should be handled internally instead
This commit is contained in:
Matthew Hoops 2012-07-27 11:01:21 -04:00
parent 1f67c9dbbe
commit a364ef8f0f
2 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
video/video_decoder.cpp
View File

@ -210,7 +210,7 @@ uint32 AdvancedVideoDecoder::getTime() const {
uint32 time = ((const AudioTrack *)*it)->getRunningTime();
if (time != 0)
return time + (*it)->getStartTime().msecs() + _audioStartOffset.msecs();
return time + _audioStartOffset.msecs();
}
}
}
@ -364,15 +364,10 @@ Audio::Timestamp AdvancedVideoDecoder::getDuration() const {
Audio::Timestamp maxDuration(0, 1000);
for (TrackList::const_iterator it = _tracks.begin(); it != _tracks.end(); it++) {
Audio::Timestamp startTime = (*it)->getStartTime();
Audio::Timestamp duration = (*it)->getDuration();
if (duration.totalNumberOfFrames() != 0) {
// HACK: Timestamp's + operator doesn't do framerate conversion :(
duration = duration + startTime.convertToFramerate(duration.framerate());
if (duration > maxDuration)
maxDuration = duration;
}
if (duration > maxDuration)
maxDuration = duration;
}
return maxDuration;
@ -406,11 +401,7 @@ bool AdvancedVideoDecoder::Track::isRewindable() const {
}
bool AdvancedVideoDecoder::Track::rewind() {
return seek(getStartTime());
}
Audio::Timestamp AdvancedVideoDecoder::Track::getStartTime() const {
return Audio::Timestamp(0, 1000);
return seek(Audio::Timestamp(0, 1000));
}
Audio::Timestamp AdvancedVideoDecoder::Track::getDuration() const {

6
video/video_decoder.h
View File

@ -466,12 +466,6 @@ protected:
*/
bool isPaused() const { return _paused; }
/**
* Get the start time of the track (starting from the beginning of the
* movie).
*/
virtual Audio::Timestamp getStartTime() const;
/**
* Get the duration of the track (starting from this track's start time).
*