[Scummvm-cvs-logs] scummvm master -> 64e1483102af4ff291b3ed14f37bff9a7a830060

clone2727 clone2727 at gmail.com
Mon Sep 24 03:05:36 CEST 2012


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
64e1483102 VIDEO: Make sure track pause status is reset upon stop too


Commit: 64e1483102af4ff291b3ed14f37bff9a7a830060
    https://github.com/scummvm/scummvm/commit/64e1483102af4ff291b3ed14f37bff9a7a830060
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2012-09-23T18:04:40-07:00

Commit Message:
VIDEO: Make sure track pause status is reset upon stop too

Changed paths:
    video/video_decoder.cpp



diff --git a/video/video_decoder.cpp b/video/video_decoder.cpp
index c1d194a..110afa7 100644
--- a/video/video_decoder.cpp
+++ b/video/video_decoder.cpp
@@ -359,6 +359,10 @@ void VideoDecoder::stop() {
 
 	// Also reset the pause state.
 	_pauseLevel = 0;
+
+	// Reset the pause state of the tracks too
+	for (TrackList::iterator it = _tracks.begin(); it != _tracks.end(); it++)
+		(*it)->pause(false);
 }
 
 Audio::Timestamp VideoDecoder::getDuration() const {






More information about the Scummvm-git-logs mailing list