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

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index dc6ed10c4..c323c8281 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -86,7 +86,6 @@ FilmViewer::FilmViewer (wxWindow* p)
 	, _playing (false)
 	, _suspended (0)
 	, _latency_history_count (0)
-	, _dropped (0)
 	, _closed_captions_dialog (new ClosedCaptionsDialog(p, this))
 	, _outline_content (false)
 	, _eyes (EYES_LEFT)
@@ -94,7 +93,6 @@ FilmViewer::FilmViewer (wxWindow* p)
 #ifdef DCPOMATIC_VARIANT_SWAROOP
 	, _background_image (false)
 #endif
-	, _state_timer ("viewer")
 	, _gets (0)
 	, _idle_get (false)
 {
@@ -122,7 +120,7 @@ FilmViewer::~FilmViewer ()
 
 /** Ask for ::get() to be called next time we are idle */
 void
-FilmViewer::request_idle_get ()
+FilmViewer::request_idle_display_next_frame ()
 {
 	if (_idle_get) {
 		return;
@@ -140,7 +138,7 @@ FilmViewer::idle_handler ()
 		return;
 	}
 
-	if (_video_view->get(true)) {
+	if (_video_view->display_next_frame(true)) {
 		_idle_get = false;
 	} else {
 		/* get() could not complete quickly so we'll try again later */
@@ -156,10 +154,8 @@ FilmViewer::set_film (shared_ptr<Film> film)
 	}
 
 	_film = film;
-	_video_position = DCPTime ();
-	_video_view->clear ();
 
-	_video_view->set_image (shared_ptr<Image>());
+	_video_view->clear ();
 	_closed_captions_dialog->clear ();
 
 	if (!_film) {
@@ -185,6 +181,7 @@ FilmViewer::set_film (shared_ptr<Film> film)
 	_player->set_play_referenced ();
 
 	_film->Change.connect (boost::bind (&FilmViewer::film_change, this, _1, _2));
+	_film->LengthChange.connect (boost::bind(&FilmViewer::film_length_change, this));
 	_player->Change.connect (boost::bind (&FilmViewer::player_change, this, _1, _2, _3));
 
 	/* Keep about 1 second's worth of history samples */
@@ -230,9 +227,7 @@ FilmViewer::recreate_butler ()
 void
 FilmViewer::refresh_view ()
 {
-	_state_timer.set ("update-view");
 	_video_view->update ();
-	_state_timer.unset ();
 }
 
 void
@@ -256,7 +251,6 @@ FilmViewer::video_view_sized ()
 	if (!quick_refresh()) {
 		slow_refresh ();
 	}
-	PositionChanged ();
 }
 
 void
@@ -303,7 +297,7 @@ FilmViewer::resume ()
 	--_suspended;
 	if (_playing && !_suspended) {
 		if (_audio.isStreamOpen()) {
-			_audio.setStreamTime (_video_position.seconds());
+			_audio.setStreamTime (_video_view->position().seconds());
 			_audio.startStream ();
 		}
 		_video_view->start ();
@@ -324,12 +318,11 @@ FilmViewer::start ()
 	}
 
 	if (_audio.isStreamOpen()) {
-		_audio.setStreamTime (_video_position.seconds());
+		_audio.setStreamTime (_video_view->position().seconds());
 		_audio.startStream ();
 	}
 
 	_playing = true;
-	_dropped = 0;
 	_video_view->start ();
 	Started (position());
 }
@@ -347,6 +340,7 @@ FilmViewer::stop ()
 	}
 
 	_playing = false;
+	_video_view->stop ();
 	Stopped (position());
 	return true;
 }
@@ -380,22 +374,33 @@ FilmViewer::player_change (ChangeType type, int property, bool frequent)
 	if (!refreshed) {
 		slow_refresh ();
 	}
-	PositionChanged ();
 }
 
 void
 FilmViewer::film_change (ChangeType type, Film::Property p)
 {
-	if (type == CHANGE_TYPE_DONE && p == Film::AUDIO_CHANNELS) {
+	if (type != CHANGE_TYPE_DONE) {
+		return;
+	}
+
+	if (p == Film::AUDIO_CHANNELS) {
 		recreate_butler ();
+	} else if (p == Film::VIDEO_FRAME_RATE) {
+		_video_view->set_video_frame_rate (_film->video_frame_rate());
 	}
 }
 
+void
+FilmViewer::film_length_change ()
+{
+	_video_view->set_length (_film->length());
+}
+
 /** Re-get the current frame slowly by seeking */
 void
 FilmViewer::slow_refresh ()
 {
-	seek (_video_position, true);
+	seek (_video_view->position(), true);
 }
 
 /** Try to re-get the current frame quickly by resetting the metadata
@@ -460,7 +465,9 @@ FilmViewer::seek (DCPTime t, bool accurate)
 	_butler->seek (t, accurate);
 
 	if (!_playing) {
-		request_idle_get ();
+		request_idle_display_next_frame ();
+	} else {
+		while (!_video_view->display_next_frame(false)) {}
 	}
 
 	resume ();
@@ -538,18 +545,24 @@ FilmViewer::uncorrected_time () const
 		return DCPTime::from_seconds (const_cast<RtAudio*>(&_audio)->getStreamTime());
 	}
 
-	return _video_position;
+	return _video_view->position();
 }
 
-DCPTime
-FilmViewer::time () const
+optional<DCPTime>
+FilmViewer::audio_time () const
 {
-	if (_audio.isStreamRunning ()) {
-		return DCPTime::from_seconds (const_cast<RtAudio*>(&_audio)->getStreamTime ()) -
-			DCPTime::from_frames (average_latency(), _film->audio_frame_rate());
+	if (!_audio.isStreamRunning()) {
+		return optional<DCPTime>();
 	}
 
-	return _video_position;
+	return DCPTime::from_seconds (const_cast<RtAudio*>(&_audio)->getStreamTime ()) -
+		DCPTime::from_frames (average_latency(), _film->audio_frame_rate());
+}
+
+DCPTime
+FilmViewer::time () const
+{
+	return audio_time().get_value_or(_video_view->position());
 }
 
 int
@@ -622,7 +635,7 @@ FilmViewer::show_closed_captions ()
 void
 FilmViewer::seek_by (DCPTime by, bool accurate)
 {
-	seek (_video_position + by, accurate);
+	seek (_video_view->position() + by, accurate);
 }
 
 void
@@ -631,10 +644,16 @@ FilmViewer::set_pad_black (bool p)
 	_pad_black = p;
 }
 
-/* XXX_b: comment */
+/* May be called from a non-UI thread */
+void
+FilmViewer::emit_finished ()
+{
+	emit (boost::bind(boost::ref(Finished)));
+}
+
 int
-FilmViewer::time_until_next_frame () const
+FilmViewer::dropped () const
 {
-	DCPTime const next = position() + one_video_frame();
-	return max ((next.seconds() - time().seconds()) * 1000, 1.0);
+	return _video_view->dropped ();
 }
+