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

[clone2727]

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:
0bcd441405 VIDEO: Fix seeking when playing with a custom rate
a0863dfb3f TINSEL: Silence gcc warning


Commit: 0bcd4414050e2b8571de0086c1820982ff886320
    https://github.com/scummvm/scummvm/commit/0bcd4414050e2b8571de0086c1820982ff886320
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2012-12-13T14:46:02-08:00

Commit Message:
VIDEO: Fix seeking when playing with a custom rate

Changed paths:
    video/video_decoder.cpp



diff --git a/video/video_decoder.cpp b/video/video_decoder.cpp
index 4d9f19c..ab12cfd 100644
--- a/video/video_decoder.cpp
+++ b/video/video_decoder.cpp
@@ -318,7 +318,7 @@ bool VideoDecoder::seek(const Audio::Timestamp &time) {
 	// Also reset our start time
 	if (isPlaying()) {
 		startAudio();
-		_startTime = g_system->getMillis() - time.msecs();
+		_startTime = g_system->getMillis() - (time.msecs() / _playbackRate).toInt();
 	}
 
 	resetPauseStartTime();


Commit: a0863dfb3f3998f34c591f3007efe9f9f0f7f311
    https://github.com/scummvm/scummvm/commit/a0863dfb3f3998f34c591f3007efe9f9f0f7f311
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2012-12-13T14:46:16-08:00

Commit Message:
TINSEL: Silence gcc warning

Changed paths:
    engines/tinsel/sound.cpp



diff --git a/engines/tinsel/sound.cpp b/engines/tinsel/sound.cpp
index 2fb1dc1..03aa376 100644
--- a/engines/tinsel/sound.cpp
+++ b/engines/tinsel/sound.cpp
@@ -510,7 +510,7 @@ void SoundManager::showSoundError(const char *errorMsg, const char *soundFile) {
 	GUI::MessageDialog dialog(msg, "OK");
 	dialog.runModal();
 
-	error(msg.c_str());
+	error("%s", msg.c_str());
 }
 
 /**