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

[moralrecordings]

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:
e89112af3f DIRECTOR: Add stub for v3 DigitalVideoCast


Commit: e89112af3f5b5a52e8e365d2b006c9abf98ecbab
    https://github.com/scummvm/scummvm/commit/e89112af3f5b5a52e8e365d2b006c9abf98ecbab
Author: Scott Percival (code at moral.net.au)
Date: 2020-06-21T17:57:28+08:00

Commit Message:
DIRECTOR: Add stub for v3 DigitalVideoCast

Changed paths:
    engines/director/cast.cpp


diff --git a/engines/director/cast.cpp b/engines/director/cast.cpp
index 45a73bc96f..c69feacb11 100644
--- a/engines/director/cast.cpp
+++ b/engines/director/cast.cpp
@@ -149,27 +149,34 @@ void BitmapCast::createWidget() {
 DigitalVideoCast::DigitalVideoCast(Common::ReadStreamEndian &stream, uint16 version) {
 	_type = kCastDigitalVideo;
 
-	for (int i = 0; i < 4; i++) {
-		stream.readUint16();
-	}
-	_frameRate = stream.readByte();
-	stream.readByte();
+	if (version < 4) {
+		warning("STUB: DigitalVideoCast: unhandled properties data");
+		for (int i = 0; i < 0xd; i++) {
+			stream.readByte();
+		}
+	} else {
+		for (int i = 0; i < 4; i++) {
+			stream.readUint16();
+		}
+		_frameRate = stream.readByte();
+		stream.readByte();
 
-	byte flags1 = stream.readByte();
-	_frameRateType = kFrameRateDefault;
-	if (flags1 & 0x08) {
-		_frameRateType = (FrameRateType)((flags1 & 0x30) >> 4);
+		byte flags1 = stream.readByte();
+		_frameRateType = kFrameRateDefault;
+		if (flags1 & 0x08) {
+			_frameRateType = (FrameRateType)((flags1 & 0x30) >> 4);
+		}
+		_preload = flags1 & 0x04;
+		_enableVideo = ~(flags1 & 0x02);
+		_pauseAtStart = flags1 & 0x01;
+
+		byte flags2 = stream.readByte();
+		_showControls = flags2 & 0x40;
+		_looping = flags2 & 0x10;
+		_enableSound = flags2 & 0x08;
+		_enableCrop = ~(flags2 & 0x02);
+		_center = flags2 & 0x01;
 	}
-	_preload = flags1 & 0x04;
-	_enableVideo = ~(flags1 & 0x02);
-	_pauseAtStart = flags1 & 0x01;
-
-	byte flags2 = stream.readByte();
-	_showControls = flags2 & 0x40;
-	_looping = flags2 & 0x10;
-	_enableSound = flags2 & 0x08;
-	_enableCrop = ~(flags2 & 0x02);
-	_center = flags2 & 0x01;
 }
 
 SoundCast::SoundCast(Common::ReadStreamEndian &stream, uint16 version) {