From f1f1a0dab1329e75a9718a417d640966763b9e7d Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 7 Nov 2018 00:09:51 +0000 Subject: [PATCH] Fix crash when using playback logging. --- src/tools/dcpomatic_player.cc | 51 +++++++++++++++++++++++------------ 1 file changed, 34 insertions(+), 17 deletions(-) diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc index 8096e1bb4..db9463fe2 100644 --- a/src/tools/dcpomatic_player.cc +++ b/src/tools/dcpomatic_player.cc @@ -48,6 +48,7 @@ #include "lib/dcpomatic_socket.h" #include "lib/scoped_temporary.h" #include "lib/monitor_checker.h" +#include "lib/ffmpeg_content.h" #include #include #include @@ -299,26 +300,42 @@ public: return; } - shared_ptr dcp = boost::dynamic_pointer_cast(_film->content().front()); - DCPOMATIC_ASSERT (dcp); - DCPExaminer ex (dcp); - shared_ptr playing_cpl; - BOOST_FOREACH (shared_ptr i, ex.cpls()) { - if (!dcp->cpl() || i->id() == *dcp->cpl()) { - playing_cpl = i; + FILE* f = fopen_boost(*log, "a"); + + /* XXX: this only logs the first piece of content; probably should be each piece? */ + + shared_ptr dcp = dynamic_pointer_cast(_film->content().front()); + if (dcp) { + DCPExaminer ex (dcp); + shared_ptr playing_cpl; + BOOST_FOREACH (shared_ptr i, ex.cpls()) { + if (!dcp->cpl() || i->id() == *dcp->cpl()) { + playing_cpl = i; + } } + DCPOMATIC_ASSERT (playing_cpl); + + fprintf ( + f, + "%s playback-started %s %s %s\n", + dcp::LocalTime().as_string().c_str(), + time.timecode(_film->video_frame_rate()).c_str(), + dcp->directories().front().string().c_str(), + playing_cpl->annotation_text().c_str() + ); + } + + shared_ptr ffmpeg = dynamic_pointer_cast(_film->content().front()); + if (ffmpeg) { + fprintf ( + f, + "%s playback-started %s %s\n", + dcp::LocalTime().as_string().c_str(), + time.timecode(_film->video_frame_rate()).c_str(), + ffmpeg->path(0).string().c_str() + ); } - DCPOMATIC_ASSERT (playing_cpl) - FILE* f = fopen_boost(*log, "a"); - fprintf ( - f, - "%s playback-started %s %s %s\n", - dcp::LocalTime().as_string().c_str(), - time.timecode(_film->video_frame_rate()).c_str(), - dcp->directories().front().string().c_str(), - playing_cpl->annotation_text().c_str() - ); fclose (f); } -- 2.30.2