pot/merge.

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

diff --git a/src/lib/player.h b/src/lib/player.h
index 20d9c9388b33fa00464aa06609a836514220571e..9dd5afd26ae3114e66b5a2121936702c5ab97014 100644 (file)
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -32,6 +32,7 @@
 #include "content_subtitle.h"
 #include "audio_stream.h"
 #include "audio_merger.h"
+#include "empty.h"
 #include <boost/shared_ptr.hpp>
 #include <boost/enable_shared_from_this.hpp>
 #include <list>
@@ -62,9 +63,11 @@ public:
 
        void set_video_container_size (dcp::Size);
        void set_ignore_video ();
+       void set_ignore_subtitle ();
        void set_always_burn_subtitles (bool burn);
        void set_fast ();
        void set_play_referenced ();
+       void set_dcp_decode_reduction (boost::optional<int> reduction);
 
        /** Emitted when something has changed such that if we went back and emitted
         *  the last frame again it would look different.  This is not emitted after
@@ -87,6 +90,7 @@ private:
        friend struct player_time_calculation_test1;
        friend struct player_time_calculation_test2;
        friend struct player_time_calculation_test3;
+       friend struct player_subframe_test;
 
        void setup_pieces ();
        void flush ();
@@ -108,7 +112,6 @@ private:
        void subtitle_stop (boost::weak_ptr<Piece>, ContentTime);
        DCPTime one_video_frame () const;
        void fill_audio (DCPTimePeriod period);
-       void audio_transform (boost::shared_ptr<AudioContent> content, AudioStreamPtr stream, ContentAudio content_audio, DCPTime time);
        std::pair<boost::shared_ptr<AudioBuffers>, DCPTime> discard_audio (
                boost::shared_ptr<const AudioBuffers> audio, DCPTime time, DCPTime discard_to
                ) const;
@@ -130,7 +133,7 @@ private:
        /** true if the player should ignore all video; i.e. never produce any */
        bool _ignore_video;
        /** true if the player should ignore all audio; i.e. never produce any */
-       bool _ignore_audio;
+       bool _ignore_subtitle;
        /** true if the player should always burn subtitles into the video regardless
            of content settings
        */
@@ -145,6 +148,8 @@ private:
        /** Time just after the last audio frame we emitted, or the time of the last accurate seek */
        boost::optional<DCPTime> _last_audio_time;
 
+       boost::optional<int> _dcp_decode_reduction;
+
        typedef std::map<boost::weak_ptr<Piece>, boost::shared_ptr<PlayerVideo> > LastVideoMap;
        LastVideoMap _last_video;
 
@@ -165,8 +170,8 @@ private:
        };
        std::map<AudioStreamPtr, StreamState> _stream_states;
 
-       std::list<DCPTimePeriod> _no_video;
-       std::list<DCPTimePeriod> _no_audio;
+       Empty _black;
+       Empty _silent;
 
        ActiveSubtitles _active_subtitles;
        boost::shared_ptr<AudioProcessor> _audio_processor;