X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fdcp_encoder.h;h=3ccd5695eea0c30ffe90cd9ff8e1641dc36b3362;hb=a5be11a965c2c38442e4e069874e7e21b5b43a5c;hp=b1514efdc7d0715070c76445dee8ecae32ec528b;hpb=2d57296a24c2eb4f6d99325add0e986de04f7e7d;p=dcpomatic.git

diff --git a/src/lib/dcp_encoder.h b/src/lib/dcp_encoder.h
index b1514efdc..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>
 
@@ -52,12 +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<const Film> _film;
-	boost::weak_ptr<Job> _job;
 	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;
 };