[Scummvm-git-logs] scummvm master -> 7053648484f28b4d214a926cce58359210f03b31

[sev-]

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:
7053648484 DIRECTOR: Properly set movieRate when DV ends


Commit: 7053648484f28b4d214a926cce58359210f03b31
    https://github.com/scummvm/scummvm/commit/7053648484f28b4d214a926cce58359210f03b31
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-08-18T23:39:05+02:00

Commit Message:
DIRECTOR: Properly set movieRate when DV ends

Changed paths:
    engines/director/castmember.cpp
    engines/director/channel.cpp
    engines/director/channel.h


diff --git a/engines/director/castmember.cpp b/engines/director/castmember.cpp
index e142b067ab..22f5ac6011 100644
--- a/engines/director/castmember.cpp
+++ b/engines/director/castmember.cpp
@@ -313,7 +313,7 @@ Graphics::MacWidget *DigitalVideoCastMember::createWidget(Common::Rect &bbox, Ch
 	}
 
 	// FIXME: HACK: We need to understand when really start the video
-	if (!_video->isPlaying()) {
+	if (!_video->isPlaying() && _channel->_movieRate != 0.0) {
 		_video->start();
 		debugC(2, kDebugImages, "STARTING VIDEO");
 
@@ -340,6 +340,9 @@ Graphics::MacWidget *DigitalVideoCastMember::createWidget(Common::Rect &bbox, Ch
 		}
 	}
 
+	if (_video->endOfVideo())
+		_channel->_movieRate = 0.0;
+
 	return widget;
 }
 
diff --git a/engines/director/channel.cpp b/engines/director/channel.cpp
index 4e42ae6b01..80c75225ec 100644
--- a/engines/director/channel.cpp
+++ b/engines/director/channel.cpp
@@ -44,7 +44,7 @@ Channel::Channel(Sprite *sp, int priority) {
 	_width = _sprite->_width;
 	_height = _sprite->_height;
 
-	_movieRate = 0;
+	_movieRate = 0.0;
 	_movieTime = 0;
 	_startTime = 0;
 	_stopTime = 0;
diff --git a/engines/director/channel.h b/engines/director/channel.h
index dbcf2c8e56..3eac0f53c7 100644
--- a/engines/director/channel.h
+++ b/engines/director/channel.h
@@ -81,7 +81,7 @@ public:
 	int _height;
 
 	// Using in digital movie sprites
-	byte _movieRate;
+	double _movieRate;
 	uint16 _movieTime;
 	uint16 _startTime;
 	uint16 _stopTime;