X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fbutler.cc;h=d50c461c8a1275ab1102665623a45270faa3d434;hb=d759f6003067e8376899b50e5692b2bbb4e870cc;hp=3e408c4d52e852e19e853a83087e0f477c9b9c7b;hpb=a57717d54c34096d80a467ad78e9fdcecca70b2c;p=dcpomatic.git

diff --git a/src/lib/butler.cc b/src/lib/butler.cc
index 3e408c4d5..d50c461c8 100644
--- a/src/lib/butler.cc
+++ b/src/lib/butler.cc
@@ -65,7 +65,7 @@ Butler::Butler (shared_ptr<Player> player, shared_ptr<Log> log, AudioMapping aud
 	_player_video_connection = _player->Video.connect (bind (&Butler::video, this, _1, _2));
 	_player_audio_connection = _player->Audio.connect (bind (&Butler::audio, this, _1, _2));
 	_player_text_connection = _player->Text.connect (bind (&Butler::text, this, _1, _2, _3, _4));
-	/* The butler must here about things first, otherwise it might not sort out suspensions in time for
+	/* The butler must hear about things first, otherwise it might not sort out suspensions in time for
 	   get_video() to be called in response to this signal.
 	*/
 	_player_change_connection = _player->Change.connect (bind (&Butler::player_change, this, _1, _3), boost::signals2::at_front);
@@ -78,7 +78,10 @@ Butler::Butler (shared_ptr<Player> player, shared_ptr<Log> log, AudioMapping aud
 	   multi-thread JPEG2000 decoding.
 	*/
 
-	LOG_TIMING("start-prepare-threads %1", boost::thread::hardware_concurrency());
+	if (_log) {
+		LOG_TIMING("start-prepare-threads %1", boost::thread::hardware_concurrency());
+	}
+
 	for (size_t i = 0; i < boost::thread::hardware_concurrency(); ++i) {
 		_prepare_pool.create_thread (bind (&boost::asio::io_service::run, &_prepare_service));
 	}
@@ -120,11 +123,11 @@ Butler::should_run () const
 			(__FILE__, __LINE__, String::compose ("Butler audio buffers reached %1 frames (video is %2)", _audio.size(), _video.size()));
 	}
 
-	if (_video.size() >= MAXIMUM_VIDEO_READAHEAD * 2) {
+	if (_video.size() >= MAXIMUM_VIDEO_READAHEAD * 2 && _log) {
 		LOG_WARNING ("Butler video buffers reached %1 frames (audio is %2)", _video.size(), _audio.size());
 	}
 
-	if (_audio.size() >= MAXIMUM_AUDIO_READAHEAD * 2) {
+	if (_audio.size() >= MAXIMUM_AUDIO_READAHEAD * 2 && _log) {
 		LOG_WARNING ("Butler audio buffers reached %1 frames (video is %2)", _audio.size(), _video.size());
 	}
 
@@ -259,9 +262,15 @@ Butler::prepare (weak_ptr<PlayerVideo> weak_video) const
 	shared_ptr<PlayerVideo> video = weak_video.lock ();
 	/* If the weak_ptr cannot be locked the video obviously no longer requires any work */
 	if (video) {
-		LOG_TIMING("start-prepare in %1", thread_id());
+		if (_log) {
+			LOG_TIMING("start-prepare in %1", thread_id());
+		}
+
 		video->prepare ();
-		LOG_TIMING("finish-prepare in %1", thread_id());
+
+		if (_log) {
+			LOG_TIMING("finish-prepare in %1", thread_id());
+		}
 	}
 }
 
@@ -270,8 +279,8 @@ Butler::video (shared_ptr<PlayerVideo> video, DCPTime time)
 {
 	boost::mutex::scoped_lock lm (_mutex);
 
-	if (_pending_seek_position || _suspended) {
-		/* Don't store any video in these cases */
+	if (_pending_seek_position) {
+		/* Don't store any video in this case */
 		return;
 	}
 
@@ -286,7 +295,7 @@ Butler::audio (shared_ptr<AudioBuffers> audio, DCPTime time)
 {
 	{
 		boost::mutex::scoped_lock lm (_mutex);
-		if (_pending_seek_position || _disable_audio || _suspended) {
+		if (_pending_seek_position || _disable_audio) {
 			/* Don't store any audio in these cases */
 			return;
 		}