[Scummvm-git-logs] scummvm master -> ce461df0db5ac0bc3c891748ae629676d7896952

[sev-]

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:
420cb78c48 DIRECTOR: Implement setStopTime() for Digital Video
ce461df0db DIRECTOR: Add patch for endless loop in l-zone mac v1


Commit: 420cb78c4819b68cf9e89ca75c20c53eaba06f52
    https://github.com/scummvm/scummvm/commit/420cb78c4819b68cf9e89ca75c20c53eaba06f52
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-08-13T12:55:57+02:00

Commit Message:
DIRECTOR: Implement setStopTime() for Digital Video

Changed paths:
    engines/director/castmember.cpp
    engines/director/lingo/lingo-the.cpp


diff --git a/engines/director/castmember.cpp b/engines/director/castmember.cpp
index 879aa1b770..9eeddf58b6 100644
--- a/engines/director/castmember.cpp
+++ b/engines/director/castmember.cpp
@@ -348,7 +348,11 @@ void DigitalVideoCastMember::setStopTime(int stamp) {
 	if (!_video)
 		return;
 
-	warning("STUB: DigitalVideoCastMember::setStopTime(%d)", stamp);
+	_channel->_stopTime = stamp;
+
+	Audio::Timestamp dur = _video->getDuration();
+
+	_video->setEndTime(Audio::Timestamp(_channel->_stopTime * 1000 / 60, dur.framerate()));
 }
 
 void DigitalVideoCastMember::setMovieRate(int rate) {
diff --git a/engines/director/lingo/lingo-the.cpp b/engines/director/lingo/lingo-the.cpp
index 09908b2a94..b9aba7b643 100644
--- a/engines/director/lingo/lingo-the.cpp
+++ b/engines/director/lingo/lingo-the.cpp
@@ -1700,7 +1700,7 @@ void Lingo::setTheCast(Datum &id1, int field, Datum &d) {
 	case kTheFrameRate:
 		if (castType == kCastDigitalVideo) {
 			((DigitalVideoCastMember *)member)->_frameRate = d.asInt();
-			//((DigitalVideoCastMember *)sprite->_cast)->setFrameRate(d.asInt());
+			((DigitalVideoCastMember *)member)->setFrameRate(d.asInt());
 		} else {
 			warning("Lingo::setTheCast(): Unsupported setting kCastDigitalVideo field \"%s\" of cast %d", field2str(field), id);
 		}


Commit: ce461df0db5ac0bc3c891748ae629676d7896952
    https://github.com/scummvm/scummvm/commit/ce461df0db5ac0bc3c891748ae629676d7896952
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-08-13T12:55:57+02:00

Commit Message:
DIRECTOR: Add patch for endless loop in l-zone mac v1

Changed paths:
    engines/director/lingo/lingo-patcher.cpp


diff --git a/engines/director/lingo/lingo-patcher.cpp b/engines/director/lingo/lingo-patcher.cpp
index d34e4e40e0..b84520ba47 100644
--- a/engines/director/lingo/lingo-patcher.cpp
+++ b/engines/director/lingo/lingo-patcher.cpp
@@ -136,6 +136,11 @@ struct ScriptPatch {
 				"alert \"Failed Save.\" & return & \"Error message number: \" & string ( filer )"},
 
 
+	// Patching dead loop which was fixed in v2
+	{"lzone", "", kPlatformMacintosh, "DATA/R-A/Ami-00", kScoreScript, 3,
+			2, "continue", "go \"OUT\""},
+
+	// Garbage at end of statements
 	{"lzone", "", kPlatformMacintosh, "DATA/R-E/ZD2-LAS", kScoreScript, 7,
 			4, "go to the frame 0", "go to the frame"},
 	{"lzone", "", kPlatformMacintosh, "DATA/R-E/zd1-con1", kScoreScript, 27,