Fix detection of same-frame to speed up simple encodes (#548).

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

diff --git a/src/lib/player.h b/src/lib/player.h
index 01439a26f00e2c272c6adf8226f8e50643bb38f6..52dffec24656a1edadcefab42756ea73bb6844d2 100644 (file)
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -92,8 +92,9 @@ public:
        std::list<boost::shared_ptr<Font> > get_subtitle_fonts ();
 
        void set_video_container_size (dcp::Size);
-       void set_approximate_size ();
        void set_ignore_video ();
+       void set_enable_subtitles (bool enable);
+       void set_burn_subtitles (bool burn);
 
        PlayerStatistics const & statistics () const;
        
@@ -117,9 +118,9 @@ private:
        void film_changed (Film::Property);
        std::list<PositionImage> transform_image_subtitles (std::list<ImageSubtitle>) const;
        void update_subtitle_from_text ();
-       VideoFrame dcp_to_content_video (boost::shared_ptr<const Piece> piece, DCPTime t) const;
-       DCPTime content_video_to_dcp (boost::shared_ptr<const Piece> piece, VideoFrame f) const;
-       AudioFrame dcp_to_content_audio (boost::shared_ptr<const Piece> piece, DCPTime t) const;
+       Frame dcp_to_content_video (boost::shared_ptr<const Piece> piece, DCPTime t) const;
+       DCPTime content_video_to_dcp (boost::shared_ptr<const Piece> piece, Frame f) const;
+       Frame dcp_to_content_audio (boost::shared_ptr<const Piece> piece, DCPTime t) const;
        ContentTime dcp_to_content_subtitle (boost::shared_ptr<const Piece> piece, DCPTime t) const;
        boost::shared_ptr<PlayerVideo> black_player_video_frame (DCPTime) const;
 
@@ -157,9 +158,12 @@ private:
        dcp::Size _video_container_size;
        boost::shared_ptr<Image> _black_image;
 
-       bool _approximate_size;
        /** true if the player should ignore all video; i.e. never produce any */
        bool _ignore_video;
+       /** true if the player should burn subtitles into the video */
+       bool _burn_subtitles;
+
+       boost::shared_ptr<AudioProcessor> _audio_processor;
 
        PlayerStatistics _statistics;