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

diff --git a/src/lib/butler.cc b/src/lib/butler.cc
index f19e1e080..ce35b1f39 100644
--- a/src/lib/butler.cc
+++ b/src/lib/butler.cc
@@ -20,25 +20,25 @@
 
 
 #include "butler.h"
-#include "player.h"
-#include "util.h"
-#include "log.h"
-#include "dcpomatic_log.h"
-#include "cross.h"
 #include "compose.hpp"
+#include "cross.h"
+#include "dcpomatic_log.h"
 #include "exceptions.h"
+#include "log.h"
+#include "player.h"
+#include "util.h"
 #include "video_content.h"
 
 
 using std::cout;
-using std::pair;
+using std::function;
 using std::make_pair;
+using std::pair;
+using std::shared_ptr;
 using std::string;
 using std::weak_ptr;
-using std::shared_ptr;
 using boost::bind;
 using boost::optional;
-using std::function;
 using namespace dcpomatic;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
@@ -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)
@@ -149,7 +150,7 @@ Butler::should_run () const
 
 	if (_audio.size() >= MAXIMUM_AUDIO_READAHEAD * 10) {
 		/* This is way too big */
-		optional<DCPTime> pos = _audio.peek();
+		auto pos = _audio.peek();
 		if (pos) {
 			throw ProgrammingError
 				(__FILE__, __LINE__, String::compose ("Butler audio buffers reached %1 frames at %2 (video is %3)", _audio.size(), pos->get(), _video.size()));
@@ -373,27 +374,27 @@ Butler::audio (shared_ptr<AudioBuffers> audio, DCPTime time, int frame_rate)
 }
 
 
-/** Try to get `frames' frames of audio and copy it into `out'.  Silence
- *  will be filled if no audio is available.
- *  @return time of this audio, or unset if there was a buffer underrun.
+/** Try to get `frames' frames of audio and copy it into `out'.
+ *  @param behaviour BLOCKING if we should block until audio is available.  If behaviour is NON_BLOCKING
+ *  and no audio is immediately available the buffer will be filled with silence and boost::none
+ *  will be returned.
+ *  @return time of this audio, or unset if blocking was false and no data was available.
  */
 optional<DCPTime>
-Butler::get_audio (float* out, Frame frames)
+Butler::get_audio (Behaviour behaviour, float* out, Frame frames)
 {
+	boost::mutex::scoped_lock lm (_mutex);
+
+	while (behaviour == Behaviour::BLOCKING && !_finished && !_died && _audio.size() < frames) {
+		_arrived.wait (lm);
+	}
+
 	auto t = _audio.get (out, _audio_channels, frames);
 	_summon.notify_all ();
 	return t;
 }
 
 
-void
-Butler::disable_audio ()
-{
-	boost::mutex::scoped_lock lm (_mutex);
-	_disable_audio = true;
-}
-
-
 pair<size_t, string>
 Butler::memory_used () const
 {