[Scummvm-git-logs] scummvm master -> 72ccb7694082ac71e1d426a64a3063189d460984

[sev-]

This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
1c420e3fc3 JANITORIAL: Indentation fixes
819a6130cb DIRECTOR: Create surface for DigitalVideo
40a368deb0 DIRECTOR: Remove redundant method
72ccb76940 DIRECTOR: Decode digital video frames (produces garbage)


Commit: 1c420e3fc3bba872a83904ffa0ed60164ee46f63
    https://github.com/scummvm/scummvm/commit/1c420e3fc3bba872a83904ffa0ed60164ee46f63
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-08-11T13:10:10+02:00

Commit Message:
JANITORIAL: Indentation fixes

Changed paths:
    engines/director/types.h


diff --git a/engines/director/types.h b/engines/director/types.h
index 7f5c62915f..03db154c73 100644
--- a/engines/director/types.h
+++ b/engines/director/types.h
@@ -274,14 +274,14 @@ enum TransitionType {
 
 // TODO: Can there be any more built-in palette types?
 enum PaletteType {
- kClutSystemMac = -1,
- kClutRainbow = -2,
- kClutGrayscale = -3,
- kClutPastels = -4,
- kClutVivid = -5,
- kClutNTSC = -6,
- kClutMetallic = -7,
- kClutSystemWin = -101
+	kClutSystemMac = -1,
+	kClutRainbow = -2,
+	kClutGrayscale = -3,
+	kClutPastels = -4,
+	kClutVivid = -5,
+	kClutNTSC = -6,
+	kClutMetallic = -7,
+	kClutSystemWin = -101
 };
 
 enum {


Commit: 819a6130cb098449816af63371818505e9643cef
    https://github.com/scummvm/scummvm/commit/819a6130cb098449816af63371818505e9643cef
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-08-11T13:10:10+02:00

Commit Message:
DIRECTOR: Create surface for DigitalVideo

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


diff --git a/engines/director/castmember.cpp b/engines/director/castmember.cpp
index f6086b7daf..49da87ed56 100644
--- a/engines/director/castmember.cpp
+++ b/engines/director/castmember.cpp
@@ -270,7 +270,12 @@ DigitalVideoCastMember::DigitalVideoCastMember(Cast *cast, uint16 castId, Common
 }
 
 DigitalVideoCastMember::~DigitalVideoCastMember() {
+	delete _video;
+}
 
+Graphics::MacWidget *DigitalVideoCastMember::createWidget(Common::Rect &bbox) {
+	Graphics::MacWidget *widget = new Graphics::MacWidget(g_director->getCurrentWindow(), bbox.left, bbox.top, bbox.width(), bbox.height(), g_director->_wm, false);
+	return widget;
 }
 
 SoundCastMember::SoundCastMember(Cast *cast, uint16 castId, Common::SeekableReadStreamEndian &stream, uint16 version)
diff --git a/engines/director/castmember.h b/engines/director/castmember.h
index 1d2c7afcf6..e8d3a67dd6 100644
--- a/engines/director/castmember.h
+++ b/engines/director/castmember.h
@@ -122,6 +122,8 @@ public:
 	DigitalVideoCastMember(Cast *cast, uint16 castId, Common::SeekableReadStreamEndian &stream, uint16 version);
 	~DigitalVideoCastMember();
 
+	virtual Graphics::MacWidget *createWidget(Common::Rect &bbox) override;
+
 	uint32 _vflags;
 	bool _looping;
 	bool _pausedAtStart;


Commit: 40a368deb0d1d214c88a755f6a450135505e2864
    https://github.com/scummvm/scummvm/commit/40a368deb0d1d214c88a755f6a450135505e2864
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-08-11T13:10:10+02:00

Commit Message:
DIRECTOR: Remove redundant method

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


diff --git a/engines/director/castmember.cpp b/engines/director/castmember.cpp
index 49da87ed56..3e3495e2f5 100644
--- a/engines/director/castmember.cpp
+++ b/engines/director/castmember.cpp
@@ -512,10 +512,6 @@ Common::String TextCastMember::getText() {
 	return _ptext;
 }
 
-bool TextCastMember::isModified() {
-	return _modified;
-}
-
 bool TextCastMember::isEditable() {
 	return _editable;
 }
diff --git a/engines/director/castmember.h b/engines/director/castmember.h
index e8d3a67dd6..ca65647680 100644
--- a/engines/director/castmember.h
+++ b/engines/director/castmember.h
@@ -177,7 +177,6 @@ public:
 	virtual Graphics::MacWidget *createWidget(Common::Rect &bbox) override;
 	virtual Common::Rect getWidgetRect() override;
 
-	virtual bool isModified() override;
 	virtual bool isEditable() override;
 	virtual void setEditable(bool editable) override;
 	virtual void updateFromWidget(Graphics::MacWidget *widget) override;


Commit: 72ccb7694082ac71e1d426a64a3063189d460984
    https://github.com/scummvm/scummvm/commit/72ccb7694082ac71e1d426a64a3063189d460984
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-08-11T13:10:10+02:00

Commit Message:
DIRECTOR: Decode digital video frames (produces garbage)

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


diff --git a/engines/director/castmember.cpp b/engines/director/castmember.cpp
index 3e3495e2f5..958c88a3de 100644
--- a/engines/director/castmember.cpp
+++ b/engines/director/castmember.cpp
@@ -273,8 +273,18 @@ DigitalVideoCastMember::~DigitalVideoCastMember() {
 	delete _video;
 }
 
+bool DigitalVideoCastMember::isModified() {
+	if (!_video)
+		return false;
+
+	return _video->needsUpdate();
+}
+
 Graphics::MacWidget *DigitalVideoCastMember::createWidget(Common::Rect &bbox) {
 	Graphics::MacWidget *widget = new Graphics::MacWidget(g_director->getCurrentWindow(), bbox.left, bbox.top, bbox.width(), bbox.height(), g_director->_wm, false);
+
+	widget->getSurface()->blitFrom(*_video->decodeNextFrame());
+
 	return widget;
 }
 
diff --git a/engines/director/castmember.h b/engines/director/castmember.h
index ca65647680..e09f20af7e 100644
--- a/engines/director/castmember.h
+++ b/engines/director/castmember.h
@@ -122,6 +122,7 @@ public:
 	DigitalVideoCastMember(Cast *cast, uint16 castId, Common::SeekableReadStreamEndian &stream, uint16 version);
 	~DigitalVideoCastMember();
 
+	virtual bool isModified() override;
 	virtual Graphics::MacWidget *createWidget(Common::Rect &bbox) override;
 
 	uint32 _vflags;