Barely-functioning GL playback with new arrangement.

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

diff --git a/src/wx/video_view.cc b/src/wx/video_view.cc
index eb85079c3795285adf4f5548ff94f86ea4f5e91d..22cad3979dbdc44cb18375f51e9487aa2a7ee09c 100644 (file)
--- a/src/wx/video_view.cc
+++ b/src/wx/video_view.cc
@@ -19,6 +19,9 @@
 */
 
 #include "video_view.h"
 */
 
 #include "video_view.h"

+#include "wx_util.h"
+#include "film_viewer.h"
+#include "lib/butler.h"

 
 void
 VideoView::clear ()
 
 void
 VideoView::clear ()


@@ -26,3 +29,34 @@ VideoView::clear ()
        _player_video.first.reset ();
        _player_video.second = dcpomatic::DCPTime ();
 }
        _player_video.first.reset ();
        _player_video.second = dcpomatic::DCPTime ();
 }

+
+/** @param non_blocking true to return false quickly if no video is available quickly.
+ *  @return false if we gave up because it would take too long, otherwise true.
+ */
+bool
+VideoView::get_next_frame (bool non_blocking)
+{
+       DCPOMATIC_ASSERT (_viewer->butler());
+       _viewer->_gets++;
+
+       do {
+               Butler::Error e;
+               _player_video = _viewer->butler()->get_video (!non_blocking, &e);
+               if (!_player_video.first && e == Butler::AGAIN) {
+                       return false;
+               }
+       } while (
+               _player_video.first &&
+               _viewer->film()->three_d() &&
+               _viewer->_eyes != _player_video.first->eyes() &&
+               _player_video.first->eyes() != EYES_BOTH
+               );
+
+       try {
+               _viewer->butler()->rethrow ();
+       } catch (DecodeError& e) {
+               error_dialog (get(), e.what());
+       }
+
+       return true;
+}