Fix merging of audio in various circumstances.

1 files changed, 6 insertions, 0 deletions

diff --git a/src/lib/player.h b/src/lib/player.h
index 69149d039..c10f7adaa 100644
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -107,6 +107,9 @@ private:
 	void image_subtitle (boost::weak_ptr<Piece>, ContentImageSubtitle);
 	void text_subtitle (boost::weak_ptr<Piece>, ContentTextSubtitle);
 	boost::shared_ptr<Resampler> resampler (boost::shared_ptr<const AudioContent> content, AudioStreamPtr stream, bool create);
+	DCPTime one_video_frame () const;
+	void fill_video (DCPTimePeriod period);
+	void fill_audio (DCPTimePeriod period);
 
 	boost::shared_ptr<const Film> _film;
 	boost::shared_ptr<const Playlist> _playlist;
@@ -154,6 +157,9 @@ private:
 	};
 	std::map<AudioStreamPtr, StreamState> _stream_states;
 
+	std::list<DCPTimePeriod> _no_video;
+	std::list<DCPTimePeriod> _no_audio;
+
 	std::list<std::pair<PlayerSubtitles, DCPTimePeriod> > _subtitles;
 
 	boost::shared_ptr<AudioProcessor> _audio_processor;