Change MagickImageProxy to FFmpegImageProxy and make it use FFmpeg

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

diff --git a/src/lib/dcp_encoder.h b/src/lib/dcp_encoder.h
index 7fbb076f3d313cceb550fd5c3104e26ce5ca4092..3ccd5695eea0c30ffe90cd9ff8e1641dc36b3362 100644 (file)
--- a/src/lib/dcp_encoder.h
+++ b/src/lib/dcp_encoder.h
@@ -20,6 +20,7 @@
 
 #include "types.h"
 #include "player_text.h"
+#include "dcp_text_track.h"
 #include "encoder.h"
 #include <boost/weak_ptr.hpp>
 
@@ -52,7 +53,7 @@ private:
 
        void video (boost::shared_ptr<PlayerVideo>, DCPTime);
        void audio (boost::shared_ptr<AudioBuffers>, DCPTime);
-       void subtitle (PlayerText, DCPTimePeriod);
+       void text (PlayerText, TextType, boost::optional<DCPTextTrack>, DCPTimePeriod);
 
        boost::shared_ptr<Writer> _writer;
        boost::shared_ptr<J2KEncoder> _j2k_encoder;
@@ -61,5 +62,5 @@ private:
 
        boost::signals2::scoped_connection _player_video_connection;
        boost::signals2::scoped_connection _player_audio_connection;
-       boost::signals2::scoped_connection _player_subtitle_connection;
+       boost::signals2::scoped_connection _player_text_connection;
 };