From 483989f72bb132d187112ec65b9a5bd3607f9252 Mon Sep 17 00:00:00 2001 From: Matthew Hoops Date: Wed, 12 Sep 2012 20:18:53 -0400 Subject: Revert "PEGASUS: Make setting the start time of a movie also seek" This reverts commit b8bcbb46b47b30c87a0267211ae4aae4c61c4c78. 8808393b3a3428df2946d7967e52aba084c8ffe5 was the proper fix for the issue --- engines/pegasus/movie.cpp | 9 +-------- engines/pegasus/movie.h | 2 -- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/engines/pegasus/movie.cpp b/engines/pegasus/movie.cpp index fcceee149a..6187d87a2d 100644 --- a/engines/pegasus/movie.cpp +++ b/engines/pegasus/movie.cpp @@ -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); diff --git a/engines/pegasus/movie.h b/engines/pegasus/movie.h index 275deecca8..9b9cc2bdbe 100644 --- a/engines/pegasus/movie.h +++ b/engines/pegasus/movie.h @@ -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; -- cgit v1.2.3