summaryrefslogtreecommitdiff
path: root/src/lib/player.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2017-02-22 13:40:17 +0000
committerCarl Hetherington <cth@carlh.net>2017-04-19 23:04:32 +0100
commitb20c4b11abff0bd57dab03174070ec8571bbe4d5 (patch)
tree305ac5e9e346a644743348173caefc7422fe179f /src/lib/player.h
parent8edc349253daf5eb0d9ceb75f467cdbbc668f27a (diff)
Fix pull timing; fix units of ReelWriter::total_written_audio_frames.
Diffstat (limited to 'src/lib/player.h')
-rw-r--r--src/lib/player.h14
1 files changed, 14 insertions, 0 deletions
diff --git a/src/lib/player.h b/src/lib/player.h
index c891ee85c..69149d039 100644
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -140,6 +140,20 @@ private:
AudioMerger _audio_merger;
DCPTime _last_audio_time;
+ class StreamState {
+ public:
+ StreamState () {}
+
+ StreamState (boost::shared_ptr<Piece> p, DCPTime l)
+ : piece(p)
+ , last_push_end(l)
+ {}
+
+ boost::shared_ptr<Piece> piece;
+ DCPTime last_push_end;
+ };
+ std::map<AudioStreamPtr, StreamState> _stream_states;
+
std::list<std::pair<PlayerSubtitles, DCPTimePeriod> > _subtitles;
boost::shared_ptr<AudioProcessor> _audio_processor;