X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.cc;h=31093cb0a8581de14087867cbc22608c64d1dc40;hb=89780827d5d6ec9127eae0108d10f71dc79d1a72;hp=f40ed229faa6d253c80592b901d370c6ebdf91c9;hpb=805487369e57e5eb57911805ba6de78b653d79ad;p=dcpomatic.git

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index f40ed229f..31093cb0a 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -156,9 +156,8 @@ FilmViewer::set_film (shared_ptr<Film> film)
 	}
 
 	_film = film;
-	_video_view->clear ();
 
-	_video_view->set_image (shared_ptr<Image>());
+	_video_view->clear ();
 	_closed_captions_dialog->clear ();
 
 	if (!_film) {
@@ -184,6 +183,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 */
@@ -326,8 +326,8 @@ FilmViewer::start ()
 		_audio.startStream ();
 	}
 
-	_playing = true;
 	_dropped = 0;
+	_playing = true;
 	_video_view->start ();
 	Started (position());
 }
@@ -345,6 +345,7 @@ FilmViewer::stop ()
 	}
 
 	_playing = false;
+	_video_view->stop ();
 	Stopped (position());
 	return true;
 }
@@ -383,11 +384,23 @@ FilmViewer::player_change (ChangeType type, int property, bool frequent)
 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 ()
@@ -540,6 +553,17 @@ FilmViewer::uncorrected_time () const
 	return _video_view->position();
 }
 
+optional<DCPTime>
+FilmViewer::audio_time () const
+{
+	if (!_audio.isStreamRunning()) {
+		return optional<DCPTime>();
+	}
+
+	return DCPTime::from_seconds (const_cast<RtAudio*>(&_audio)->getStreamTime ()) -
+		DCPTime::from_frames (average_latency(), _film->audio_frame_rate());
+}
+
 DCPTime
 FilmViewer::time () const
 {
@@ -630,14 +654,10 @@ FilmViewer::set_pad_black (bool p)
 	_pad_black = p;
 }
 
-/* XXX_b: comment */
-int
-FilmViewer::time_until_next_frame () const
+/* May be called from a non-UI thread */
+void
+FilmViewer::emit_finished ()
 {
-	DCPTime const next = position() + one_video_frame();
-	std::cout << to_string(next) << " " << to_string(time()) << " " << ((next.seconds() - time().seconds()) * 1000) << "\n";
-	if (next < time()) {
-		return 0;
-	}
-	return (next.seconds() - time().seconds()) * 1000;
+	emit (boost::bind(boost::ref(Finished)));
 }
+