Fix merging of audio in various circumstances.

[dcpomatic.git] / src / lib / player.h

diff --git a/src/lib/player.h b/src/lib/player.h
index 69149d0393aefe2b8863eca73f0661fe8d34f37f..c10f7adaa21d0ed597ab4f75553acf0133d82da8 100644 (file)
--- 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;