diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-02-23 00:57:04 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-02-23 00:58:08 +0000 |
| commit | 24ba224ab4871e453df50fde94b5b32649a3d47b (patch) | |
| tree | 2c90d0f0dc1ce819f8599722e743e0017e98fd7b /src/lib/player.h | |
| parent | 1d4c7f065389981ba145b89a0a224cb986d8eb5b (diff) | |
Fix implementation of delay in 7758260; it needs to apply to
anything passed to emit_video(), not just things that come from
decoders.
Diffstat (limited to 'src/lib/player.h')
| -rw-r--r-- | src/lib/player.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/player.h b/src/lib/player.h index 58ed4e369..8142f8e7f 100644 --- a/src/lib/player.h +++ b/src/lib/player.h @@ -33,7 +33,6 @@ #include "audio_stream.h" #include "audio_merger.h" #include "empty.h" -#include "delay.h" #include <boost/shared_ptr.hpp> #include <boost/enable_shared_from_this.hpp> #include <list> @@ -121,6 +120,7 @@ private: ) const; boost::optional<PositionImage> subtitles_for_frame (DCPTime time) const; void emit_video (boost::shared_ptr<PlayerVideo> pv, DCPTime time); + void do_emit_video (boost::shared_ptr<PlayerVideo> pv, DCPTime time); void emit_audio (boost::shared_ptr<AudioBuffers> data, DCPTime time); boost::shared_ptr<const Film> _film; @@ -160,7 +160,7 @@ private: AudioMerger _audio_merger; Shuffler* _shuffler; - Delay* _delay; + std::list<std::pair<boost::shared_ptr<PlayerVideo>, DCPTime> > _delay; class StreamState { |