Put Time types in dcpomatic namespace.

[dcpomatic.git] / src / wx / film_viewer.cc

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index b5e60f60e09a27e0d6286bb43a66e87eefb7477f..48fbf9fdce1eba2062a2ed72b67fc5d91f6d9ccc 100644 (file)
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -44,6 +44,7 @@
 #include "lib/log.h"
 #include "lib/config.h"
 #include "lib/compose.hpp"
+#include "lib/dcpomatic_log.h"
 extern "C" {
 #include <libavutil/pixfmt.h>
 }
@@ -66,6 +67,7 @@ using boost::dynamic_pointer_cast;
 using boost::weak_ptr;
 using boost::optional;
 using dcp::Size;
+using namespace dcpomatic;
 
 static
 int
@@ -83,7 +85,7 @@ FilmViewer::FilmViewer (wxWindow* p)
        , _playing (false)
        , _latency_history_count (0)
        , _dropped (0)
-       , _closed_captions_dialog (new ClosedCaptionsDialog(p))
+       , _closed_captions_dialog (new ClosedCaptionsDialog(p, this))
        , _outline_content (false)
        , _eyes (EYES_LEFT)
        , _pad_black (false)
@@ -91,6 +93,8 @@ FilmViewer::FilmViewer (wxWindow* p)
        , _in_watermark (false)
        , _background_image (false)
 #endif
+       , _state_timer ("viewer")
+       , _gets (0)
 {
 #ifndef __WXOSX__
        _panel->SetDoubleBuffered (true);
@@ -200,7 +204,7 @@ FilmViewer::recreate_butler ()
                _butler->disable_audio ();
        }
 
-       _closed_captions_dialog->set_butler (_butler);
+       _closed_captions_dialog->set_film_and_butler (_film, _butler);
 
        if (was_running) {
                start ();
@@ -210,14 +214,17 @@ FilmViewer::recreate_butler ()
 void
 FilmViewer::refresh_panel ()
 {
+       _state_timer.set ("refresh-panel");
        _panel->Refresh ();
        _panel->Update ();
+       _state_timer.unset ();
 }
 
 void
 FilmViewer::get ()
 {
        DCPOMATIC_ASSERT (_butler);
+       ++_gets;
 
        do {
                Butler::Error e;
@@ -274,9 +281,12 @@ FilmViewer::display_player_video ()
         * image and convert it (from whatever the user has said it is) to RGB.
         */
 
+       _state_timer.set ("get image");
        _frame = _player_video.first->image (bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true);
 
+       _state_timer.set ("ImageChanged");
        ImageChanged (_player_video.first);
+       _state_timer.unset ();
 
        _video_position = _player_video.second;
        _inter_position = _player_video.first->inter_position ();
@@ -304,6 +314,7 @@ FilmViewer::timer ()
                return;
        }
 
+       LOG_DEBUG_PLAYER("%1 -> %2; delay %3", next.seconds(), time().seconds(), max((next.seconds() - time().seconds()) * 1000, 1.0));
        _timer.Start (max ((next.seconds() - time().seconds()) * 1000, 1.0), wxTIMER_ONE_SHOT);
 
        if (_butler) {
@@ -335,45 +346,48 @@ FilmViewer::maybe_draw_background_image (wxPaintDC &)
 void
 FilmViewer::paint_panel ()
 {
+       _state_timer.set ("paint-panel");
+
        wxPaintDC dc (_panel);
 
 #ifdef DCPOMATIC_VARIANT_SWAROOP
        if (_background_image) {
                dc.Clear ();
                maybe_draw_background_image (dc);
+               _state_timer.unset ();
                return;
        }
 #endif
 
        if (!_out_size.width || !_out_size.height || !_film || !_frame || _out_size != _frame->size()) {
                dc.Clear ();
-               return;
-       }
+       } else {
 
-       wxImage frame (_out_size.width, _out_size.height, _frame->data()[0], true);
-       wxBitmap frame_bitmap (frame);
-       dc.DrawBitmap (frame_bitmap, 0, max(0, (_panel_size.height - _out_size.height) / 2));
+               wxImage frame (_out_size.width, _out_size.height, _frame->data()[0], true);
+               wxBitmap frame_bitmap (frame);
+               dc.DrawBitmap (frame_bitmap, 0, max(0, (_panel_size.height - _out_size.height) / 2));
 
 #ifdef DCPOMATIC_VARIANT_SWAROOP
-       DCPTime const period = DCPTime::from_seconds(Config::instance()->player_watermark_period() * 60);
-       int64_t n = _video_position.get() / period.get();
-       DCPTime from(n * period.get());
-       DCPTime to = from + DCPTime::from_seconds(Config::instance()->player_watermark_duration() / 1000.0);
-       if (from <= _video_position && _video_position <= to) {
-               if (!_in_watermark) {
-                       _in_watermark = true;
-                       _watermark_x = rand() % _panel_size.width;
-                       _watermark_y = rand() % _panel_size.height;
+               DCPTime const period = DCPTime::from_seconds(Config::instance()->player_watermark_period() * 60);
+               int64_t n = _video_position.get() / period.get();
+               DCPTime from(n * period.get());
+               DCPTime to = from + DCPTime::from_seconds(Config::instance()->player_watermark_duration() / 1000.0);
+               if (from <= _video_position && _video_position <= to) {
+                       if (!_in_watermark) {
+                               _in_watermark = true;
+                               _watermark_x = rand() % _panel_size.width;
+                               _watermark_y = rand() % _panel_size.height;
+                       }
+                       dc.SetTextForeground(*wxWHITE);
+                       string wm = Config::instance()->player_watermark_theatre();
+                       boost::posix_time::ptime t = boost::posix_time::second_clock::local_time();
+                       wm += "\n" + boost::posix_time::to_iso_extended_string(t);
+                       dc.DrawText(std_to_wx(wm), _watermark_x, _watermark_y);
+               } else {
+                       _in_watermark = false;
                }
-               dc.SetTextForeground(*wxWHITE);
-               string wm = Config::instance()->player_watermark_theatre();
-               boost::posix_time::ptime t = boost::posix_time::second_clock::local_time();
-               wm += "\n" + boost::posix_time::to_iso_extended_string(t);
-               dc.DrawText(std_to_wx(wm), _watermark_x, _watermark_y);
-       } else {
-               _in_watermark = false;
-       }
 #endif
+       }
 
        if (_out_size.width < _panel_size.width) {
                /* XXX: these colours are right for GNOME; may need adjusting for other OS */
@@ -391,7 +405,7 @@ FilmViewer::paint_panel ()
                dc.SetBrush (b);
                int const gap = (_panel_size.height - _out_size.height) / 2;
                dc.DrawRectangle (0, 0, _panel_size.width, gap);
-               dc.DrawRectangle (0, gap + _out_size.height + 1, _panel_size.width, gap);
+               dc.DrawRectangle (0, gap + _out_size.height + 1, _panel_size.width, gap + 1);
        }
 
        if (_outline_content) {
@@ -400,6 +414,8 @@ FilmViewer::paint_panel ()
                dc.SetBrush (*wxTRANSPARENT_BRUSH);
                dc.DrawRectangle (_inter_position.x, _inter_position.y + (_panel_size.height - _out_size.height) / 2, _inter_size.width, _inter_size.height);
        }
+
+       _state_timer.unset ();
 }
 
 void