From: Carl Hetherington <cth@carlh.net>
Date: Tue, 31 Dec 2013 15:44:51 +0000 (+0000)
Subject: Merge 1.0
X-Git-Tag: v2.0.48~922^2~16
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=ad49361b303d1ceff7048fa0e89ba609ca9ce376

Merge 1.0
---

ad49361b303d1ceff7048fa0e89ba609ca9ce376
diff --cc src/lib/player.cc
index 96d23a82b,cacb42651..c9f9acd94
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@@ -342,8 -374,8 +342,8 @@@ Player::emit_audio (weak_ptr<Piece> wea
  void
  Player::flush ()
  {
 -	TimedAudioBuffers<Time> tb = _audio_merger.flush ();
 +	TimedAudioBuffers<DCPTime> tb = _audio_merger.flush ();
- 	if (tb.audio) {
+ 	if (_audio && tb.audio) {
  		Audio (tb.audio, tb.time);
  		_audio_position += _film->audio_frames_to_time (tb.audio->frames ());
  	}
@@@ -352,8 -384,8 +352,8 @@@
  		emit_black ();
  	}
  
- 	while (_audio_position < _video_position) {
+ 	while (_audio && _audio_position < _video_position) {
 -		emit_silence (_film->time_to_audio_frames (_video_position - _audio_position));
 +		emit_silence (_video_position - _audio_position);
  	}
  	
  }