[Scummvm-cvs-logs] scummvm master -> e011e9ffc5f8a2aa875c69a52572bec28c8772b8

bluegr bluegr at gmail.com
Wed Jun 24 10:23:14 CEST 2015


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

Summary:
d39f93af68 SWORD25: Draw next movie frame only when an update is needed
e011e9ffc5 Merge pull request #593 from chkr-private/sword25-movie-fix


Commit: d39f93af689bc014e3f4da580fe370be12db275c
    https://github.com/scummvm/scummvm/commit/d39f93af689bc014e3f4da580fe370be12db275c
Author: Christian Krause (chkr at plauener.de)
Date: 2015-05-03T12:19:17+02:00

Commit Message:
SWORD25: Draw next movie frame only when an update is needed

This fixes the problem that the movies are played too fast
and get out of sync with additionally played speech samples.

Changed paths:
    engines/sword25/fmv/movieplayer.cpp



diff --git a/engines/sword25/fmv/movieplayer.cpp b/engines/sword25/fmv/movieplayer.cpp
index 5d7dcf2..eb0f039 100644
--- a/engines/sword25/fmv/movieplayer.cpp
+++ b/engines/sword25/fmv/movieplayer.cpp
@@ -123,7 +123,7 @@ void MoviePlayer::update() {
 		if (_decoder.endOfVideo()) {
 			// Movie complete, so unload the movie
 			unloadMovie();
-		} else {
+		} else if (_decoder.needsUpdate()) {
 			const Graphics::Surface *s = _decoder.decodeNextFrame();
 			if (s) {
 				// Transfer the next frame


Commit: e011e9ffc5f8a2aa875c69a52572bec28c8772b8
    https://github.com/scummvm/scummvm/commit/e011e9ffc5f8a2aa875c69a52572bec28c8772b8
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2015-06-24T11:22:13+03:00

Commit Message:
Merge pull request #593 from chkr-private/sword25-movie-fix

SWORD25: Delay next movie frame by videoDecoder.getTimeToNextFrame()

Changed paths:
    engines/sword25/fmv/movieplayer.cpp









More information about the Scummvm-git-logs mailing list