From e26396bf15a99a8dc9b17acf7756d7443cc56399 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Sat, 3 Aug 2013 14:05:23 +0100
Subject: Only pull audio in pass() if we are handling it.

---
 src/lib/player.cc | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/player.cc b/src/lib/player.cc
index ee044e4e1..af2e6216a 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -209,18 +209,20 @@ Player::pass ()
 		}
 		break;
 	}
-	
-	Time audio_done_up_to = TIME_MAX;
-	for (list<shared_ptr<Piece> >::iterator i = _pieces.begin(); i != _pieces.end(); ++i) {
-		if (dynamic_pointer_cast<AudioDecoder> ((*i)->decoder)) {
-			audio_done_up_to = min (audio_done_up_to, (*i)->audio_position);
-		}
-	}
 
-	TimedAudioBuffers<Time> tb = _audio_merger.pull (audio_done_up_to);
-	Audio (tb.audio, tb.time);
-	_audio_position += _film->audio_frames_to_time (tb.audio->frames ());
+	if (_audio) {
+		Time audio_done_up_to = TIME_MAX;
+		for (list<shared_ptr<Piece> >::iterator i = _pieces.begin(); i != _pieces.end(); ++i) {
+			if (dynamic_pointer_cast<AudioDecoder> ((*i)->decoder)) {
+				audio_done_up_to = min (audio_done_up_to, (*i)->audio_position);
+			}
+		}
 
+		TimedAudioBuffers<Time> tb = _audio_merger.pull (audio_done_up_to);
+		Audio (tb.audio, tb.time);
+		_audio_position += _film->audio_frames_to_time (tb.audio->frames ());
+	}
+		
 #ifdef DEBUG_PLAYER
 	cout << "\tpost pass _video_position=" << _video_position << " _audio_position=" << _audio_position << "\n";
 #endif	
-- 
cgit v1.2.3