Use VideoView::one_video_frame.

[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 e66ed815ee32f38dde215725fd85348409f81f02..7aeb317b281a4fb6811f45fa70db0de6989d182c 100644 (file)
--- a/src/wx/simple_video_view.cc
+++ b/src/wx/simple_video_view.cc
@@ -145,21 +145,21 @@ SimpleVideoView::update ()
 void
 SimpleVideoView::timer ()
 {
-       if (!_viewer->film() || !_viewer->playing()) {
+       if (!_viewer->playing()) {
                return;
        }
 
        display_next_frame (false);
        DCPTime const next = _viewer->position() + _viewer->one_video_frame();
 
-       if (next >= _viewer->film()->length()) {
+       if (next >= length()) {
                _viewer->stop ();
                _viewer->Finished ();
                return;
        }
 
        LOG_DEBUG_PLAYER("%1 -> %2; delay %3", next.seconds(), _viewer->time().seconds(), max((next.seconds() - _viewer->time().seconds()) * 1000, 1.0));
-       _timer.Start (_viewer->time_until_next_frame(), wxTIMER_ONE_SHOT);
+       _timer.Start (time_until_next_frame(), wxTIMER_ONE_SHOT);
 
        if (_viewer->butler()) {
                _viewer->butler()->rethrow ();
@@ -200,13 +200,13 @@ SimpleVideoView::display_next_frame (bool non_blocking)
 void
 SimpleVideoView::display_player_video ()
 {
-       if (!_player_video.first) {
+       if (!player_video().first) {
                set_image (shared_ptr<Image>());
                _viewer->refresh_view ();
                return;
        }
 
-       if (_viewer->playing() && (_viewer->time() - _player_video.second) > _viewer->one_video_frame()) {
+       if (_viewer->playing() && (_viewer->time() - player_video().second) > one_video_frame()) {
                /* Too late; just drop this frame before we try to get its image (which will be the time-consuming
                   part if this frame is J2K).
                */
@@ -235,15 +235,15 @@ SimpleVideoView::display_player_video ()
        _viewer->_state_timer.set ("get image");
 
        set_image (
-               _player_video.first->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true)
+               player_video().first->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true)
                );
 
        _viewer->_state_timer.set ("ImageChanged");
-       _viewer->ImageChanged (_player_video.first);
+       _viewer->ImageChanged (player_video().first);
        _viewer->_state_timer.unset ();
 
-       _viewer->_inter_position = _player_video.first->inter_position ();
-       _viewer->_inter_size = _player_video.first->inter_size ();
+       _viewer->_inter_position = player_video().first->inter_position ();
+       _viewer->_inter_size = player_video().first->inter_size ();
 
        _viewer->refresh_view ();