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

Revert "PEGASUS: Make setting the start time of a movie also seek"

Browse Source 
This reverts commit b8bcbb46b47b30c87a0267211ae4aae4c61c4c78.

8808393b3a3428df2946d7967e52aba084c8ffe5 was the proper fix for the issue
This commit is contained in:
Matthew Hoops 2012-09-12 20:18:53 -04:00
parent d5ed8b1901
commit 483989f72b
2 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
engines/pegasus/movie.cpp
View File

@ -80,7 +80,7 @@ void Movie::initFromMovieFile(const Common::String &fileName, bool transparent)
if (!isSurfaceValid())
allocateSurface(bounds);
TimeBase::setStart(0, getScale());
setStart(0, getScale());
TimeBase::setStop(_video->getDuration().convertToFramerate(getScale()).totalNumberOfFrames(), getScale());
}
@ -132,13 +132,6 @@ void Movie::moveMovieBoxTo(const CoordType h, const CoordType v) {
_movieBox.moveTo(h, v);
}
void Movie::setStart(const TimeValue startTime, const TimeScale scale) {
TimeBase::setStart(startTime, scale);
if (_video)
_video->seek(Audio::Timestamp(0, _startTime, _startScale));
}
void Movie::setStop(const TimeValue stopTime, const TimeScale scale) {
TimeBase::setStop(stopTime, scale);

2
engines/pegasus/movie.h
View File

@ -62,8 +62,6 @@ public:
virtual void moveMovieBoxTo(const CoordType, const CoordType);
virtual void setStart(const TimeValue, const TimeScale = 0);
virtual void setStop(const TimeValue, const TimeScale = 0);
virtual TimeValue getDuration(const TimeScale = 0) const;