Switch PlayerVideo::always_rgb to a new ::force and use it in FFmpegFileEncoder.

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

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 1a0e30bf4e060147d73429389d5accbf68ffd116..01963372061d8ddef25851b78a375c036b8e2cb3 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
@@ -266,13 +267,12 @@ 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),
+               bind (&PlayerVideo::force, _1, AV_PIX_FMT_RGB24),
                false, true
                );
 
@@ -353,28 +353,29 @@ FilmViewer::paint_panel ()
 #endif
 
        if (_out_size.width < _panel_size.width) {
-               wxPen p (_panel->GetParent()->GetBackgroundColour());
-               wxBrush b (_panel->GetParent()->GetBackgroundColour());
+               /* XXX: these colours are right for GNOME; may need adjusting for other OS */
+               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 (_panel->GetParent()->GetBackgroundColour());
-               wxBrush b (_panel->GetParent()->GetBackgroundColour());
+               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;
                dc.DrawRectangle (0, 0, _panel_size.width, gap);
-               dc.DrawRectangle (0, gap + _out_size.height, _panel_size.width, gap);
+               dc.DrawRectangle (0, gap + _out_size.height + 1, _panel_size.width, gap);
        }
 
        if (_outline_content) {
                wxPen p (wxColour (255, 0, 0), 2);
                dc.SetPen (p);
                dc.SetBrush (*wxTRANSPARENT_BRUSH);
-               dc.DrawRectangle (_inter_position.x, _inter_position.y, _inter_size.width, _inter_size.height);
+               dc.DrawRectangle (_inter_position.x, _inter_position.y + (_panel_size.height - _out_size.height) / 2, _inter_size.width, _inter_size.height);
        }
 }
 
@@ -745,3 +746,9 @@ FilmViewer::seek_by (DCPTime by, bool accurate)
 {
        seek (_video_position + by, accurate);
 }
+
+void
+FilmViewer::set_pad_black (bool p)
+{
+       _pad_black = p;
+}