[Scummvm-git-logs] scummvm master -> f33973293f6af322ef67990f88422e0cc9f2c63d
sev-
noreply at scummvm.org
Tue Oct 27 09:56:40 UTC 2026
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
f33973293f DIRECTOR: Fix videos started via movieRate stopping immediately
Commit: f33973293f6af322ef67990f88422e0cc9f2c63d
https://github.com/scummvm/scummvm/commit/f33973293f6af322ef67990f88422e0cc9f2c63d
Author: Adrian Herskind (88650336+AdrianJHerskind at users.noreply.github.com)
Date: 2026-10-27T10:56:36+01:00
Commit Message:
DIRECTOR: Fix videos started via movieRate stopping immediately
When a digital video sprite is started from Lingo with
`set the movieRate of sprite X to 1` instead of through
Channel::setClean(), startVideo() is never called and
_channel->_stopTime stays 0. endOfVideo() then reports the video as
finished immediately, and isModified() stops it on every update, so
movieTime never advances.
Initialise _stopTime in setMovieRate() when it is unset, and ignore an
unset stopTime in endOfVideo().
Fixes the Opera Fatal intro hanging on a black screen with no
soundtrack (audio-only QuickTime CON0822.MOV in INTRO.DXR).
Changed paths:
engines/director/castmember/digitalvideo.cpp
diff --git a/engines/director/castmember/digitalvideo.cpp b/engines/director/castmember/digitalvideo.cpp
index 06fd031897f..23fd2fd11d0 100644
--- a/engines/director/castmember/digitalvideo.cpp
+++ b/engines/director/castmember/digitalvideo.cpp
@@ -468,8 +468,12 @@ bool DigitalVideoCastMember::endOfVideo() {
// No decoder or channel means nothing is playing; avoid a null deref.
if (!_video || !_channel)
return false;
+ // A stopTime of 0 means it was never initialised (e.g. the video was
+ // started via Lingo's movieRate rather than via startVideo()), so only
+ // honour the decoder's own end-of-stream in that case.
return (_video->endOfVideo() ||
- (getMovieCurrentTimeMillis() >= (uint)(_channel->_stopTime*1000/getTimeScale())));
+ (_channel->_stopTime > 0 &&
+ getMovieCurrentTimeMillis() >= (uint)(_channel->_stopTime*1000/getTimeScale())));
}
Graphics::MacWidget *DigitalVideoCastMember::createWidget(Common::Rect &bbox, Channel *channel, SpriteType spriteType) {
@@ -670,6 +674,9 @@ void DigitalVideoCastMember::setMovieRate(double rate) {
_channel->_movieRate = rate;
+ if (_channel->_stopTime == 0)
+ _channel->_stopTime = getMovieTotalTime();
+
if (rate < 0.0)
warning("STUB: DigitalVideoCastMember::setMovieRate(%g)", rate);
else {
More information about the Scummvm-git-logs
mailing list