X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fbutler.cc;h=ce35b1f39aff61da043aa71e0a3d5fad0e963f11;hp=27b39ba4fb13b3a3bae76963f9f42b56472309fe;hb=8987f133295e352c44e05ef338eacc801c61a629;hpb=b6fb82e5df5551497b823f20a75c7ff94ffd1b3e

diff --git a/src/lib/butler.cc b/src/lib/butler.cc
index 27b39ba4f..ce35b1f39 100644
--- a/src/lib/butler.cc
+++ b/src/lib/butler.cc
@@ -69,7 +69,8 @@ Butler::Butler (
 	VideoRange video_range,
 	Image::Alignment alignment,
 	bool fast,
-	bool prepare_only_proxy
+	bool prepare_only_proxy,
+	Audio audio
 	)
 	: _film (film)
 	, _player (player)
@@ -81,7 +82,7 @@ Butler::Butler (
 	, _stop_thread (false)
 	, _audio_mapping (audio_mapping)
 	, _audio_channels (audio_channels)
-	, _disable_audio (false)
+	, _disable_audio (audio == Audio::DISABLED)
 	, _pixel_format (pixel_format)
 	, _video_range (video_range)
 	, _alignment (alignment)
@@ -394,14 +395,6 @@ Butler::get_audio (Behaviour behaviour, float* out, Frame frames)
 }
 
 
-void
-Butler::disable_audio ()
-{
-	boost::mutex::scoped_lock lm (_mutex);
-	_disable_audio = true;
-}
-
-
 pair<size_t, string>
 Butler::memory_used () const
 {