Barely-functioning GL playback with new arrangement.

[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 456d8cd30d8aca6333c193c6be8e4f413bf33c85..1e97adb30478eafb9e5b4a39195d41dcb2a8e23d 100644 (file)
--- a/src/wx/simple_video_view.cc
+++ b/src/wx/simple_video_view.cc
@@ -159,10 +159,10 @@ SimpleVideoView::timer ()
        }
 
        LOG_DEBUG_PLAYER("%1 -> %2; delay %3", next.seconds(), _viewer->time().seconds(), max((next.seconds() - _viewer->time().seconds()) * 1000, 1.0));
-       _timer.Start (max ((next.seconds() - _viewer->time().seconds()) * 1000, 1.0), wxTIMER_ONE_SHOT);
+       _timer.Start (_viewer->time_until_next_frame(), wxTIMER_ONE_SHOT);
 
-       if (_viewer->_butler) {
-               _viewer->_butler->rethrow ();
+       if (_viewer->butler()) {
+               _viewer->butler()->rethrow ();
        }
 }
 
@@ -180,33 +180,16 @@ SimpleVideoView::start ()
 bool
 SimpleVideoView::get (bool lazy)
 {
-       DCPOMATIC_ASSERT (_viewer->_butler);
-       _viewer->_gets++;
-
-       do {
-               Butler::Error e;
-               _viewer->_player_video = _viewer->_butler->get_video (!lazy, &e);
-               if (!_viewer->_player_video.first && e == Butler::AGAIN) {
-                       if (lazy) {
-                               /* No video available; return saying we failed */
-                               return false;
-                       } else {
-                               /* Player was suspended; come back later */
-                               signal_manager->when_idle (boost::bind(&SimpleVideoView::get, this, false));
-                               return false;
-                       }
+       bool r = get_next_frame (lazy);
+       if (!r) {
+               if (lazy) {
+                       /* No video available; return saying we failed */
+                       return false;
+               } else {
+                       /* Player was suspended; come back later */
+                       signal_manager->when_idle (boost::bind(&SimpleVideoView::get, this, false));
+                       return false;
                }
-       } while (
-               _viewer->_player_video.first &&
-               _viewer->film()->three_d() &&
-               _viewer->_eyes != _viewer->_player_video.first->eyes() &&
-               _viewer->_player_video.first->eyes() != EYES_BOTH
-               );
-
-       try {
-               _viewer->_butler->rethrow ();
-       } catch (DecodeError& e) {
-               error_dialog (get(), e.what());
        }
 
        display_player_video ();
@@ -218,17 +201,17 @@ SimpleVideoView::get (bool lazy)
 void
 SimpleVideoView::display_player_video ()
 {
-       if (!_viewer->_player_video.first) {
+       if (!_player_video.first) {
                set_image (shared_ptr<Image>());
                _viewer->refresh_view ();
                return;
        }
 
-       if (_viewer->playing() && (_viewer->time() - _viewer->_player_video.second) > _viewer->one_video_frame()) {
+       if (_viewer->playing() && (_viewer->time() - _player_video.second) > _viewer->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).
                */
-               _viewer->_video_position = _viewer->_player_video.second;
+               _viewer->_video_position = _player_video.second;
                ++_viewer->_dropped;
                return;
        }
@@ -254,16 +237,16 @@ SimpleVideoView::display_player_video ()
        _viewer->_state_timer.set ("get image");
 
        set_image (
-               _viewer->_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 (_viewer->_player_video.first);
+       _viewer->ImageChanged (_player_video.first);
        _viewer->_state_timer.unset ();
 
-       _viewer->_video_position = _viewer->_player_video.second;
-       _viewer->_inter_position = _viewer->_player_video.first->inter_position ();
-       _viewer->_inter_size = _viewer->_player_video.first->inter_size ();
+       _viewer->_video_position = _player_video.second;
+       _viewer->_inter_position = _player_video.first->inter_position ();
+       _viewer->_inter_size = _player_video.first->inter_size ();
 
        _viewer->refresh_view ();