C++11 tidying.

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

diff --git a/src/wx/video_view.cc b/src/wx/video_view.cc
index f8d44dc70137f321aec43a5610577032417ca1dc..5f44c37d61779db3cced384221af5fdba9289506 100644 (file)
--- a/src/wx/video_view.cc
+++ b/src/wx/video_view.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2019 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2019-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,10 +18,26 @@
 
 */
 
+
 #include "video_view.h"
 #include "wx_util.h"
 #include "film_viewer.h"
 #include "lib/butler.h"
+#include "lib/dcpomatic_log.h"
+#include <boost/optional.hpp>
+
+using std::pair;
+using std::shared_ptr;
+using boost::optional;
+
+
+VideoView::VideoView (FilmViewer* viewer)
+       : _viewer (viewer)
+       , _state_timer ("viewer")
+{
+
+}
+
 
 void
 VideoView::clear ()
@@ -31,64 +47,99 @@ VideoView::clear ()
        _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.
+
+/** Could be called from any thread.
+ *  @param non_blocking true to return false quickly if no video is available quickly.
+ *  @return FAIL if there's no frame, AGAIN if the method should be called again, or SUCCESS
+ *  if there is a frame.
  */
-bool
+VideoView::NextFrameResult
 VideoView::get_next_frame (bool non_blocking)
 {
-       if (_length == dcpomatic::DCPTime()) {
-               return true;
+       if (length() == dcpomatic::DCPTime()) {
+               return FAIL;
        }
 
-       DCPOMATIC_ASSERT (_viewer->butler());
-       _viewer->_gets++;
+       auto butler = _viewer->butler ();
+       if (!butler) {
+               return FAIL;
+       }
+       add_get ();
 
        boost::mutex::scoped_lock lm (_mutex);
 
        do {
                Butler::Error e;
-               _player_video = _viewer->butler()->get_video (!non_blocking, &e);
-               if (!_player_video.first && e == Butler::AGAIN) {
-                       return false;
+               auto pv = butler->get_video (!non_blocking, &e);
+               if (e.code == Butler::Error::DIED) {
+                       LOG_ERROR ("Butler died with %1", e.summary());
+               }
+               if (!pv.first) {
+                       return e.code == Butler::Error::AGAIN ? AGAIN : FAIL;
                }
+               _player_video = pv;
        } while (
                _player_video.first &&
-               _viewer->film()->three_d() &&
-               _viewer->_eyes != _player_video.first->eyes() &&
-               _player_video.first->eyes() != EYES_BOTH
+               _three_d &&
+               _eyes != _player_video.first->eyes() &&
+               _player_video.first->eyes() != Eyes::BOTH
                );
 
-       /* XXX_b: this is called from the GL thread so it shouldn't be opening error dialogs */
-       try {
-               _viewer->butler()->rethrow ();
-       } catch (DecodeError& e) {
-               error_dialog (get(), e.what());
+       if (_player_video.first && _player_video.first->error()) {
+               ++_errored;
        }
 
-       return true;
+       return SUCCESS;
 }
 
+
 dcpomatic::DCPTime
 VideoView::one_video_frame () const
 {
        return dcpomatic::DCPTime::from_frames (1, video_frame_rate());
 }
 
-/** @return Time in ms until the next frame is due */
-int
+
+/** @return Time in ms until the next frame is due, or empty if nothing is due */
+optional<int>
 VideoView::time_until_next_frame () const
 {
        if (length() == dcpomatic::DCPTime()) {
                /* There's no content, so this doesn't matter */
-               return 0;
+               return optional<int>();
        }
 
-       dcpomatic::DCPTime const next = position() + one_video_frame();
-       dcpomatic::DCPTime const time = _viewer->audio_time().get_value_or(position());
+       auto const next = position() + one_video_frame();
+       auto const time = _viewer->audio_time().get_value_or(position());
        if (next < time) {
                return 0;
        }
        return (next.seconds() - time.seconds()) * 1000;
 }
 
+
+void
+VideoView::start ()
+{
+       boost::mutex::scoped_lock lm (_mutex);
+       _dropped = 0;
+       _errored = 0;
+}
+
+
+bool
+VideoView::reset_metadata (shared_ptr<const Film> film, dcp::Size player_video_container_size)
+{
+       auto pv = player_video ();
+       if (!pv.first) {
+               return false;
+       }
+
+       if (!pv.first->reset_metadata(film, player_video_container_size)) {
+               return false;
+       }
+
+       update ();
+       return true;
+}
+