Fix implementation of delay in 7758260; it needs to apply to

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

diff --git a/src/lib/player.h b/src/lib/player.h
index 58ed4e36959611b8d32618a462506b85f83ed46a..8142f8e7f7df29cac429cb1042dad67c2cfa1d86 100644 (file)
--- 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
        {