Log playback start and stop timecodes.

diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index 0f0d84df2f1f785748ce011740aa097046b0f516..04d9d5ac591c076850234ec5ad29ad324d19a524 100644 (file)
--- a/src/tools/dcpomatic_player.cc
+++ b/src/tools/dcpomatic_player.cc
@@ -164,8 +164,8 @@ public:
                _controls = new Controls (_overall_panel, _viewer, false, false, false);
                _viewer->set_dcp_decode_reduction (Config::instance()->decode_reduction ());
                _viewer->PlaybackPermitted.connect (bind(&DOMFrame::playback_permitted, this));
-               _viewer->Started.connect (bind(&DOMFrame::playback_started, this));
-               _viewer->Stopped.connect (bind(&DOMFrame::playback_stopped, this));
+               _viewer->Started.connect (bind(&DOMFrame::playback_started, this, _1));
+               _viewer->Stopped.connect (bind(&DOMFrame::playback_stopped, this, _1));
                _info = new PlayerInformation (_overall_panel, _viewer);
                setup_main_sizer (true);
 #ifdef __WXOSX__
@@ -227,7 +227,7 @@ public:
                return ok;
        }
 
-       void playback_started ()
+       void playback_started (DCPTime time)
        {
                optional<boost::filesystem::path> log = Config::instance()->player_log_file();
                if (!log) {
@@ -248,15 +248,16 @@ public:
                FILE* f = fopen_boost(*log, "a");
                fprintf (
                        f,
-                       "%s playback-started %s %s\n",
+                       "%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);
        }
 
-       void playback_stopped ()
+       void playback_stopped (DCPTime time)
        {
                optional<boost::filesystem::path> log = Config::instance()->player_log_file();
                if (!log) {
@@ -264,7 +265,7 @@ public:
                }
 
                FILE* f = fopen_boost(*log, "a");
-               fprintf (f, "%s playback-stopped\n", dcp::LocalTime().as_string().c_str());
+               fprintf (f, "%s playback-stopped %s\n", dcp::LocalTime().as_string().c_str(), time.timecode(_film->video_frame_rate()).c_str());
                fclose (f);
        }
 

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index a27c0053d8ca6204dfa27c7a4adde1db7b64504c..4f5a16da81514acc0b62ac9a2cc9369b528fcfb3 100644 (file)
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -422,7 +422,7 @@ FilmViewer::start ()
        _playing = true;
        _dropped = 0;
        timer ();
-       Started ();
+       Started (position());
 }
 
 bool
@@ -438,7 +438,7 @@ FilmViewer::stop ()
        }
 
        _playing = false;
-       Stopped ();
+       Stopped (position());
        return true;
 }
 

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index 0e44994de565092c9aec2b155762b242aef683b3..fe0faca372c787d809825f71ed12c7011de99f83 100644 (file)
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -89,8 +89,8 @@ public:
 
        boost::signals2::signal<void (boost::weak_ptr<PlayerVideo>)> ImageChanged;
        boost::signals2::signal<void ()> PositionChanged;
-       boost::signals2::signal<void ()> Started;
-       boost::signals2::signal<void ()> Stopped;
+       boost::signals2::signal<void (DCPTime)> Started;
+       boost::signals2::signal<void (DCPTime)> Stopped;
        boost::signals2::signal<void ()> FilmChanged;
 
        boost::signals2::signal<bool ()> PlaybackPermitted;