X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.cc;h=bb483f0e235c98cace1283c627bf0957f893ad4c;hb=d9ab996fa416ba27b69bb65f047a1a1aa4063f1b;hp=c323c8281e7043ef7082c3346baf79ab97951508;hpb=9001a63be211fd8e97431f8fc07c66af01554f5a;p=dcpomatic.git

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index c323c8281..bb483f0e2 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -88,12 +88,10 @@ FilmViewer::FilmViewer (wxWindow* p)
 	, _latency_history_count (0)
 	, _closed_captions_dialog (new ClosedCaptionsDialog(p, this))
 	, _outline_content (false)
-	, _eyes (EYES_LEFT)
 	, _pad_black (false)
 #ifdef DCPOMATIC_VARIANT_SWAROOP
 	, _background_image (false)
 #endif
-	, _gets (0)
 	, _idle_get (false)
 {
 	switch (Config::instance()->video_view_type()) {
@@ -161,12 +159,12 @@ FilmViewer::set_film (shared_ptr<Film> film)
 	if (!_film) {
 		_player.reset ();
 		recreate_butler ();
-		refresh_view ();
+		_video_view->update ();
 		return;
 	}
 
 	try {
-		_player.reset (new Player (_film, _film->playlist ()));
+		_player.reset (new Player(_film));
 		_player->set_fast ();
 		if (_dcp_decode_reduction) {
 			_player->set_dcp_decode_reduction (_dcp_decode_reduction);
@@ -184,6 +182,10 @@ FilmViewer::set_film (shared_ptr<Film> film)
 	_film->LengthChange.connect (boost::bind(&FilmViewer::film_length_change, this));
 	_player->Change.connect (boost::bind (&FilmViewer::player_change, this, _1, _2, _3));
 
+	film_change (CHANGE_TYPE_DONE, Film::VIDEO_FRAME_RATE);
+	film_change (CHANGE_TYPE_DONE, Film::THREE_D);
+	film_length_change ();
+
 	/* Keep about 1 second's worth of history samples */
 	_latency_history_count = _film->audio_frame_rate() / _audio_block_size;
 
@@ -225,22 +227,25 @@ FilmViewer::recreate_butler ()
 }
 
 void
-FilmViewer::refresh_view ()
+FilmViewer::set_outline_content (bool o)
 {
+	_outline_content = o;
 	_video_view->update ();
 }
 
+
 void
-FilmViewer::set_outline_content (bool o)
+FilmViewer::set_outline_subtitles (optional<dcpomatic::Rect<double> > rect)
 {
-	_outline_content = o;
-	refresh_view ();
+	_outline_subtitles = rect;
+	_video_view->update ();
 }
 
+
 void
 FilmViewer::set_eyes (Eyes e)
 {
-	_eyes = e;
+	_video_view->set_eyes (e);
 	slow_refresh ();
 }
 
@@ -294,6 +299,7 @@ FilmViewer::suspend ()
 void
 FilmViewer::resume ()
 {
+	DCPOMATIC_ASSERT (_suspended > 0);
 	--_suspended;
 	if (_playing && !_suspended) {
 		if (_audio.isStreamOpen()) {
@@ -317,6 +323,17 @@ FilmViewer::start ()
 		return;
 	}
 
+	/* We are about to set up the audio stream from the position of the video view.
+	   If there is `lazy' seek in progress we need to wait for it to go through so that
+	   _video_view->position() gives us a sensible answer.
+	 */
+	while (_idle_get) {
+		idle_handler ();
+	}
+
+	/* Take the video view's idea of position as our `playhead' and start the
+	   audio stream (which is the timing reference) there.
+         */
 	if (_audio.isStreamOpen()) {
 		_audio.setStreamTime (_video_view->position().seconds());
 		_audio.startStream ();
@@ -342,6 +359,8 @@ FilmViewer::stop ()
 	_playing = false;
 	_video_view->stop ();
 	Stopped (position());
+
+	_video_view->rethrow ();
 	return true;
 }
 
@@ -387,6 +406,8 @@ FilmViewer::film_change (ChangeType type, Film::Property p)
 		recreate_butler ();
 	} else if (p == Film::VIDEO_FRAME_RATE) {
 		_video_view->set_video_frame_rate (_film->video_frame_rate());
+	} else if (p == Film::THREE_D) {
+		_video_view->set_three_d (_film->three_d());
 	}
 }
 
@@ -410,16 +431,10 @@ FilmViewer::slow_refresh ()
 bool
 FilmViewer::quick_refresh ()
 {
-	if (!_video_view->_player_video.first) {
-		return false;
-	}
-
-	if (!_video_view->_player_video.first->reset_metadata (_film, _player->video_container_size(), _film->frame_size())) {
-		return false;
+	if (!_video_view || !_film) {
+		return true;
 	}
-
-	_video_view->display_player_video ();
-	return true;
+	return _video_view->refresh_metadata (_film, _player->video_container_size(), _film->frame_size());
 }
 
 void
@@ -456,7 +471,7 @@ FilmViewer::seek (DCPTime t, bool accurate)
 	}
 
 	if (t >= _film->length ()) {
-		t = _film->length ();
+		t = _film->length() - one_video_frame();
 	}
 
 	suspend ();
@@ -465,8 +480,14 @@ FilmViewer::seek (DCPTime t, bool accurate)
 	_butler->seek (t, accurate);
 
 	if (!_playing) {
+		/* We're not playing, so let the GUI thread get on and
+		   come back later to get the next frame after the seek.
+		*/
 		request_idle_display_next_frame ();
 	} else {
+		/* We're going to start playing again straight away
+		   so wait for the seek to finish.
+		*/
 		while (!_video_view->display_next_frame(false)) {}
 	}
 
@@ -478,7 +499,7 @@ FilmViewer::config_changed (Config::Property p)
 {
 #ifdef DCPOMATIC_VARIANT_SWAROOP
 	if (p == Config::PLAYER_BACKGROUND_IMAGE) {
-		refresh_view ();
+		_video_view->update ();
 		return;
 	}
 #endif
@@ -644,11 +665,21 @@ FilmViewer::set_pad_black (bool p)
 	_pad_black = p;
 }
 
-/* May be called from a non-UI thread */
+/** Called when a player has finished the current film.
+ *  May be called from a non-UI thread.
+ */
 void
-FilmViewer::emit_finished ()
+FilmViewer::finished ()
 {
-	emit (boost::bind(boost::ref(Finished)));
+	emit (boost::bind(&FilmViewer::ui_finished, this));
+}
+
+/** Called by finished() in the UI thread */
+void
+FilmViewer::ui_finished ()
+{
+	stop ();
+	Finished ();
 }
 
 int
@@ -657,3 +688,18 @@ FilmViewer::dropped () const
 	return _video_view->dropped ();
 }
 
+
+int
+FilmViewer::errored () const
+{
+	return _video_view->errored ();
+}
+
+
+int
+FilmViewer::gets () const
+{
+	return _video_view->gets ();
+}
+
+