aboutsummaryrefslogtreecommitdiff
path: root/video/video_decoder.h
diff options
context:
space:
mode:
authorMatthew Hoops2012-09-11 17:38:33 -0400
committerMatthew Hoops2012-09-11 17:38:33 -0400
commit8808393b3a3428df2946d7967e52aba084c8ffe5 (patch)
tree3fa67a65f7ed9f3db084a14cb3a43f0a6f9b9057 /video/video_decoder.h
parentc31d1971b52ab2f4fe8ad3a04d879679620e66f1 (diff)
downloadscummvm-rg350-8808393b3a3428df2946d7967e52aba084c8ffe5.tar.gz
scummvm-rg350-8808393b3a3428df2946d7967e52aba084c8ffe5.tar.bz2
scummvm-rg350-8808393b3a3428df2946d7967e52aba084c8ffe5.zip
VIDEO: Do not close/rewind videos after a stop()
It makes more sense to do this more like a hard "pause" and let the caller stop()/rewind() if they want
Diffstat (limited to 'video/video_decoder.h')
-rw-r--r--video/video_decoder.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/video/video_decoder.h b/video/video_decoder.h
index daf78c227a..66980ab09b 100644
--- a/video/video_decoder.h
+++ b/video/video_decoder.h
@@ -102,16 +102,14 @@ public:
/**
* Begin playback of the video.
*
- * @note This has no effect is the video is already playing.
+ * @note This has no effect if the video is already playing.
*/
void start();
/**
* Stop playback of the video.
*
- * @note This will close() the video if it is not rewindable.
- * @note If the video is rewindable, the video will be rewound on the
- * next start() call unless rewind() or seek() is called before then.
+ * @note This has no effect if the video is not playing.
*/
void stop();
@@ -765,7 +763,7 @@ private:
TrackList _tracks;
// Current playback status
- bool _isPlaying, _needsRewind, _needsUpdate;
+ bool _isPlaying, _needsUpdate;
Audio::Timestamp _lastTimeChange, _endTime;
bool _endTimeSet;