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

yuv422 yuv422 at users.noreply.github.com
Mon Mar 9 08:09:13 UTC 2020


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:
bbe0b262e5 DRAGONS: Free video decoder and handle failure to load video file


Commit: bbe0b262e51489d0f4b723d82b4930d811a9d9ee
    https://github.com/scummvm/scummvm/commit/bbe0b262e51489d0f4b723d82b4930d811a9d9ee
Author: Eric Fry (yuv422 at users.noreply.github.com)
Date: 2020-03-09T19:08:30+11:00

Commit Message:
DRAGONS: Free video decoder and handle failure to load video file

Changed paths:
    engines/dragons/strplayer.cpp
    engines/dragons/strplayer.h


diff --git a/engines/dragons/strplayer.cpp b/engines/dragons/strplayer.cpp
index 6a976da9c1..19359d8ed1 100644
--- a/engines/dragons/strplayer.cpp
+++ b/engines/dragons/strplayer.cpp
@@ -32,7 +32,10 @@ StrPlayer::StrPlayer(DragonsEngine *vm, Screen *screen) : _vm(vm), _screen(scree
 
 void StrPlayer::playVideo(const Common::String &filename) {
 	bool skipped = false;
-	_decoder->loadFile(filename);
+
+	if (!_decoder->loadFile(filename)) {
+		error("Error playing video from %s", filename.c_str());
+	}
 	_decoder->start();
 
 	while (!_vm->shouldQuit() && !_decoder->endOfVideo() && !skipped) {
@@ -57,4 +60,8 @@ void StrPlayer::playVideo(const Common::String &filename) {
 	_decoder->close();
 }
 
+StrPlayer::~StrPlayer() {
+	delete _decoder;
+}
+
 } // End of namespace Dragons
diff --git a/engines/dragons/strplayer.h b/engines/dragons/strplayer.h
index cc001c7798..941431c445 100644
--- a/engines/dragons/strplayer.h
+++ b/engines/dragons/strplayer.h
@@ -35,6 +35,7 @@ private:
 	Video::VideoDecoder *_decoder;
 public:
 	StrPlayer(DragonsEngine *vm, Screen *screen);
+	~StrPlayer();
 
 	void playVideo(const Common::String &filename);
 private:




More information about the Scummvm-git-logs mailing list