X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.cc;h=2c90b86095278c9bd19b81831e27f3d82123909b;hp=22de7b5934c28751b8d73b2c14a3b56a24273249;hb=cfbe9d2f44e380efed7a61b5b5c7a2fec7794915;hpb=a855b3030e511c130992dec8894e0d96fc811d97

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 22de7b593..2c90b8609 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -371,7 +371,7 @@ FilmViewer::start ()
 	/* Calling start() below may directly result in Stopped being emitted, and if that
 	 * happens we want it to come after the Started signal, so do that first.
 	 */
-	Started (position());
+	Started ();
 	_video_view->start ();
 }
 
@@ -390,7 +390,7 @@ FilmViewer::stop ()
 
 	_playing = false;
 	_video_view->stop ();
-	Stopped (position());
+	Stopped ();
 
 	_video_view->rethrow ();
 	return true;
@@ -649,7 +649,7 @@ int
 FilmViewer::audio_callback (void* out_p, unsigned int frames)
 {
 	while (true) {
-		auto t = _butler->get_audio (reinterpret_cast<float*> (out_p), frames);
+		auto t = _butler->get_audio (Butler::Behaviour::NON_BLOCKING, reinterpret_cast<float*> (out_p), frames);
 		if (!t || DCPTime(uncorrected_time() - *t) < one_video_frame()) {
 			/* There was an underrun or this audio is on time; carry on */
 			break;