X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fvideo_view.cc;h=7eea4b786fba72917e3f9285997767545e88ea74;hb=d5bdc5cf073987043ace62378b02ffee5af818bd;hp=d54487a937f9c70f7f01e1038359d3db24c4b85e;hpb=5aff601c454fa756c0ab71ae4bcf8f7f4ce28737;p=dcpomatic.git

diff --git a/src/wx/video_view.cc b/src/wx/video_view.cc
index d54487a93..7eea4b786 100644
--- a/src/wx/video_view.cc
+++ b/src/wx/video_view.cc
@@ -22,14 +22,25 @@
 #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 boost::shared_ptr;
+using boost::optional;
 
 VideoView::VideoView (FilmViewer* viewer)
 	: _viewer (viewer)
 #ifdef DCPOMATIC_VARIANT_SWAROOP
 	, _in_watermark (false)
 #endif
+	, _state_timer ("viewer")
 	, _video_frame_rate (0)
+	, _eyes (EYES_LEFT)
+	, _three_d (false)
 	, _dropped (0)
+	, _errored (0)
+	, _gets (0)
 {
 
 }
@@ -42,34 +53,46 @@ VideoView::clear ()
 	_player_video.second = dcpomatic::DCPTime ();
 }
 
-/** @param non_blocking true to return false quickly if no video is available quickly.
+/** Could be called from any thread.
+ *  @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)
 {
-	if (_length == dcpomatic::DCPTime()) {
+	if (length() == dcpomatic::DCPTime()) {
 		return true;
 	}
 
-	DCPOMATIC_ASSERT (_viewer->butler());
-	_viewer->_gets++;
+	shared_ptr<Butler> butler = _viewer->butler ();
+	if (!butler) {
+		return false;
+	}
+	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) {
+		pair<shared_ptr<PlayerVideo>, dcpomatic::DCPTime> pv = butler->get_video (!non_blocking, &e);
+		if (e.code == Butler::Error::DIED) {
+			LOG_ERROR ("Butler died with %1", e.summary());
+		}
+		if (!pv.first && e.code == Butler::Error::AGAIN) {
 			return false;
 		}
+		_player_video = pv;
 	} while (
 		_player_video.first &&
-		_viewer->film()->three_d() &&
-		_viewer->_eyes != _player_video.first->eyes() &&
+		_three_d &&
+		_eyes != _player_video.first->eyes() &&
 		_player_video.first->eyes() != EYES_BOTH
 		);
 
+	if (_player_video.first && _player_video.first->error()) {
+		++_errored;
+	}
+
 	return true;
 }
 
@@ -79,13 +102,13 @@ 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();
@@ -101,4 +124,22 @@ VideoView::start ()
 {
 	boost::mutex::scoped_lock lm (_mutex);
 	_dropped = 0;
+	_errored = 0;
 }
+
+bool
+VideoView::refresh_metadata (shared_ptr<const Film> film, dcp::Size video_container_size, dcp::Size film_frame_size)
+{
+	pair<shared_ptr<PlayerVideo>, dcpomatic::DCPTime> pv = player_video ();
+	if (!pv.first) {
+		return false;
+	}
+
+	if (!pv.first->reset_metadata (film, video_container_size, film_frame_size)) {
+		return false;
+	}
+
+	update ();
+	return true;
+}
+