X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_encoder.h;h=3ccd5695eea0c30ffe90cd9ff8e1641dc36b3362;hb=72b11d5eb036651b6ff68edf3ed270e8fc52960f;hp=38792197243a0bb4adc02ae1c9761ec25ef6d30d;hpb=d8ea1796f34ff894b148a0af78c0a547e0496ee1;p=dcpomatic.git

diff --git a/src/lib/dcp_encoder.h b/src/lib/dcp_encoder.h
index 387921972..3ccd5695e 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>
 
@@ -36,6 +37,7 @@ class DCPEncoder : public Encoder
 {
 public:
 	DCPEncoder (boost::shared_ptr<const Film> film, boost::weak_ptr<Job> job);
+	~DCPEncoder ();
 
 	void go ();
 
@@ -51,10 +53,14 @@ private:
 
 	void video (boost::shared_ptr<PlayerVideo>, DCPTime);
 	void audio (boost::shared_ptr<AudioBuffers>, DCPTime);
-	void subtitle (PlayerSubtitles, DCPTimePeriod);
+	void text (PlayerText, TextType, boost::optional<DCPTextTrack>, DCPTimePeriod);
 
 	boost::shared_ptr<Writer> _writer;
 	boost::shared_ptr<J2KEncoder> _j2k_encoder;
 	bool _finishing;
 	bool _non_burnt_subtitles;
+
+	boost::signals2::scoped_connection _player_video_connection;
+	boost::signals2::scoped_connection _player_audio_connection;
+	boost::signals2::scoped_connection _player_text_connection;
 };