Tidy and fix logging.

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

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 2247f3dd066b23eace5c03136519be8a76e62532..66b919a7588d72aaa2f55444860bc8fedc6aaad7 100644 (file)
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -86,6 +86,7 @@ FilmViewer::FilmViewer (wxWindow* p)
        , _closed_captions_dialog (new ClosedCaptionsDialog(p))
        , _outline_content (false)
        , _eyes (EYES_LEFT)
+       , _pad_black (false)
 #ifdef DCPOMATIC_VARIANT_SWAROOP
        , _in_watermark (false)
 #endif
@@ -192,7 +193,7 @@ FilmViewer::recreate_butler ()
                map.set (dcp::RS,     1, 1 / sqrt(2)); // Rs -> Rt
        }
 
-       _butler.reset (new Butler (_player, _film->log(), map, _audio_channels));
+       _butler.reset (new Butler(_player, map, _audio_channels, bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true));
        if (!Config::instance()->sound() && !_audio.isStreamOpen()) {
                _butler->disable_audio ();
        }
@@ -266,15 +267,11 @@ FilmViewer::display_player_video ()
         * The content's specified colour conversion indicates the colourspace
         * which the content is in (according to the user).
         *
-        * PlayerVideo::image (bound to PlayerVideo::always_rgb) will take the source
+        * PlayerVideo::image (bound to PlayerVideo::force) will take the source
         * image and convert it (from whatever the user has said it is) to RGB.
         */
 
-       _frame = _player_video.first->image (
-               bind (&Log::dcp_log, _film->log().get(), _1, _2),
-               bind (&PlayerVideo::always_rgb, _1),
-               false, true
-               );
+       _frame = _player_video.first->image (bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true);
 
        ImageChanged (_player_video.first);
 
@@ -309,6 +306,22 @@ FilmViewer::timer ()
        }
 }
 
+bool
+FilmViewer::maybe_draw_background_image (wxPaintDC& dc)
+{
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+       optional<boost::filesystem::path> bg = Config::instance()->player_background_image();
+       if (bg) {
+               wxImage image (std_to_wx(bg->string()));
+               wxBitmap bitmap (image);
+               dc.DrawBitmap (bitmap, max(0, (_panel_size.width - image.GetSize().GetWidth()) / 2), max(0, (_panel_size.height - image.GetSize().GetHeight()) / 2));
+               return true;
+       }
+#endif
+
+       return false;
+}
+
 void
 FilmViewer::paint_panel ()
 {
@@ -316,14 +329,11 @@ FilmViewer::paint_panel ()
 
        if (!_frame || !_film || !_out_size.width || !_out_size.height || _out_size != _frame->size()) {
                dc.Clear ();
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-               optional<boost::filesystem::path> bg = Config::instance()->player_background_image();
-               if (bg) {
-                       wxImage image (std_to_wx(bg->string()));
-                       wxBitmap bitmap (image);
-                       dc.DrawBitmap (bitmap, max(0, (_panel_size.width - image.GetSize().GetWidth()) / 2), max(0, (_panel_size.height - image.GetSize().GetHeight()) / 2));
-               }
-#endif
+               maybe_draw_background_image (dc);
+               return;
+       }
+
+       if (_video_position == DCPTime() && maybe_draw_background_image (dc)) {
                return;
        }
 
@@ -354,16 +364,16 @@ FilmViewer::paint_panel ()
 
        if (_out_size.width < _panel_size.width) {
                /* XXX: these colours are right for GNOME; may need adjusting for other OS */
-               wxPen p (wxColour (240, 240, 240));
-               wxBrush b (wxColour (240, 240, 240));
+               wxPen   p (_pad_black ? wxColour(0, 0, 0) : wxColour(240, 240, 240));
+               wxBrush b (_pad_black ? wxColour(0, 0, 0) : wxColour(240, 240, 240));
                dc.SetPen (p);
                dc.SetBrush (b);
                dc.DrawRectangle (_out_size.width, 0, _panel_size.width - _out_size.width, _panel_size.height);
        }
 
        if (_out_size.height < _panel_size.height) {
-               wxPen p (wxColour (240, 240, 240));
-               wxBrush b (wxColour (240, 240, 240));
+               wxPen   p (_pad_black ? wxColour(0, 0, 0) : wxColour(240, 240, 240));
+               wxBrush b (_pad_black ? wxColour(0, 0, 0) : wxColour(240, 240, 240));
                dc.SetPen (p);
                dc.SetBrush (b);
                int const gap = (_panel_size.height - _out_size.height) / 2;
@@ -534,7 +544,7 @@ FilmViewer::quick_refresh ()
                return false;
        }
 
-       if (!_player_video.first->reset_metadata (_player->video_container_size(), _film->frame_size())) {
+       if (!_player_video.first->reset_metadata (_film, _player->video_container_size(), _film->frame_size())) {
                return false;
        }
 
@@ -746,3 +756,9 @@ FilmViewer::seek_by (DCPTime by, bool accurate)
 {
        seek (_video_position + by, accurate);
 }
+
+void
+FilmViewer::set_pad_black (bool p)
+{
+       _pad_black = p;
+}