Move _inter_position out of FilmViewer.

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

diff --git a/src/wx/simple_video_view.cc b/src/wx/simple_video_view.cc
index 33e2834c5bba8820855d3eeba336455c87dbae4c..6a8a863d71c22a961bb7a62708d48b74782d1fb8 100644 (file)
--- a/src/wx/simple_video_view.cc
+++ b/src/wx/simple_video_view.cc
@@ -125,12 +125,11 @@ SimpleVideoView::paint ()
        }
 
        if (_viewer->outline_content()) {
        }
 
        if (_viewer->outline_content()) {

-               Position<int> inter_position = _viewer->inter_position ();

                dcp::Size inter_size = _viewer->inter_size ();
                wxPen p (wxColour (255, 0, 0), 2);
                dc.SetPen (p);
                dc.SetBrush (*wxTRANSPARENT_BRUSH);
                dcp::Size inter_size = _viewer->inter_size ();
                wxPen p (wxColour (255, 0, 0), 2);
                dc.SetPen (p);
                dc.SetBrush (*wxTRANSPARENT_BRUSH);

-               dc.DrawRectangle (inter_position.x, inter_position.y + (panel_size.GetHeight() - out_size.height) / 2, inter_size.width, inter_size.height);
+               dc.DrawRectangle (_inter_position.x, _inter_position.y + (panel_size.GetHeight() - out_size.height) / 2, inter_size.width, inter_size.height);

        }
         _viewer->state_timer().unset();
 }
        }
         _viewer->state_timer().unset();
 }


@@ -249,7 +248,7 @@ SimpleVideoView::display_player_video ()
        _viewer->ImageChanged (player_video().first);
        _viewer->_state_timer.unset ();
 
        _viewer->ImageChanged (player_video().first);
        _viewer->_state_timer.unset ();
 

-       _viewer->_inter_position = player_video().first->inter_position ();
+       _inter_position = player_video().first->inter_position ();

        _viewer->_inter_size = player_video().first->inter_size ();
 
        _viewer->refresh_view ();
        _viewer->_inter_size = player_video().first->inter_size ();
 
        _viewer->refresh_view ();