X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fdcp_encoder.h;h=cc2de3e0c924bb1881aa3eef57907ba86de793a6;hp=15f3dbc64ba2ff68b798dae682942426a4b5b4b6;hb=f515b8daea9d28200be803bb64ff17e9f30343c4;hpb=a69d242f3f00207d6ea7320e6723775f4b0dbfb3

diff --git a/src/lib/dcp_encoder.h b/src/lib/dcp_encoder.h
index 15f3dbc64..cc2de3e0c 100644
--- a/src/lib/dcp_encoder.h
+++ b/src/lib/dcp_encoder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2017 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -19,7 +19,8 @@
 */
 
 #include "types.h"
-#include "player_subtitles.h"
+#include "player_text.h"
+#include "dcp_text_track.h"
 #include "encoder.h"
 #include <boost/weak_ptr.hpp>
 
@@ -40,7 +41,7 @@ public:
 
 	void go ();
 
-	float current_rate () const;
+	boost::optional<float> current_rate () const;
 	Frame frames_done () const;
 
 	/** @return true if we are in the process of calling Encoder::process_end */
@@ -50,9 +51,9 @@ public:
 
 private:
 
-	void video (boost::shared_ptr<PlayerVideo>, DCPTime);
-	void audio (boost::shared_ptr<AudioBuffers>, DCPTime);
-	void subtitle (PlayerSubtitles, DCPTimePeriod);
+	void video (boost::shared_ptr<PlayerVideo>, dcpomatic::DCPTime);
+	void audio (boost::shared_ptr<AudioBuffers>, dcpomatic::DCPTime);
+	void text (PlayerText, TextType, boost::optional<DCPTextTrack>, dcpomatic::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;
 };