Try to tidy up channel mapping a bit.

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

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index a619edf7c7bfa9fd70e8ed64fbb53d7828ef44a5..96656ce097891ef8d8f6d54aaa59c518e52c9118 100644 (file)
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -57,7 +57,7 @@ FilmViewer::FilmViewer (shared_ptr<Film> f, wxWindow* p)
        , _clear_required (false)
 {
        _panel->SetDoubleBuffered (true);
-#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 9       
+#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 9
        _panel->SetBackgroundStyle (wxBG_STYLE_PAINT);
 #endif 
        
@@ -70,7 +70,7 @@ FilmViewer::FilmViewer (shared_ptr<Film> f, wxWindow* p)
        h_sizer->Add (_play_button, 0, wxEXPAND);
        h_sizer->Add (_slider, 1, wxEXPAND);
 
-       _v_sizer->Add (h_sizer, 0, wxEXPAND);
+       _v_sizer->Add (h_sizer, 0, wxEXPAND | wxALL, 6);
 
        _panel->Connect (wxID_ANY, wxEVT_PAINT, wxPaintEventHandler (FilmViewer::paint_panel), 0, this);
        _panel->Connect (wxID_ANY, wxEVT_SIZE, wxSizeEventHandler (FilmViewer::panel_sized), 0, this);
@@ -149,7 +149,6 @@ FilmViewer::set_film (shared_ptr<Film> f)
        _film->Changed.connect (boost::bind (&FilmViewer::film_changed, this, _1));
 
        film_changed (Film::CONTENT);
-       film_changed (Film::CROP);
        film_changed (Film::FORMAT);
        film_changed (Film::WITH_SUBTITLES);
        film_changed (Film::SUBTITLE_OFFSET);
@@ -209,7 +208,7 @@ FilmViewer::paint_panel (wxPaintEvent &)
                dc.SetPen(*wxBLACK_PEN);
                dc.SetBrush(*wxBLACK_BRUSH);
                dc.DrawRectangle (0, 0, _display_frame_x, _film_size.height);
-               dc.DrawRectangle (_display_frame_x + _film_size.width, 0, _display_frame_x * 2 + _film_size.width, _film_size.height);
+               dc.DrawRectangle (_display_frame_x + _film_size.width, 0, _display_frame_x, _film_size.height);
        }
 
        wxImage frame (_film_size.width, _film_size.height, _display_frame->data()[0], true);
@@ -289,9 +288,16 @@ FilmViewer::raw_to_display ()
        }
 
        if (_raw_sub) {
+
+               /* Our output is already cropped by the decoder, so we need to account for that
+                  when working out the scale that we are applying.
+               */
+
+               Size const cropped_size = _film->cropped_size (_film->size ());
+
                Rect tx = subtitle_transformed_area (
-                       float (_film_size.width) / _film->size().width,
-                       float (_film_size.height) / _film->size().height,
+                       float (_film_size.width) / cropped_size.width,
+                       float (_film_size.height) / cropped_size.height,
                        _raw_sub->area(), _film->subtitle_offset(), _film->subtitle_scale()
                        );