X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsubtitle_encoder.h;h=165d5fcb67792f409b3d8e2060b0fa2a707cc565;hb=6d7cb904ba47773e0d50b3bf3e5162c0f6df9896;hp=50485750d2ee146da8b0f57430aa52d2635eabfd;hpb=2cdf3d9f461b12d0925cc54368105bbd177bbbb3;p=dcpomatic.git

diff --git a/src/lib/subtitle_encoder.h b/src/lib/subtitle_encoder.h
index 50485750d..165d5fcb6 100644
--- a/src/lib/subtitle_encoder.h
+++ b/src/lib/subtitle_encoder.h
@@ -23,7 +23,6 @@
 #include "dcp_text_track.h"
 #include "encoder.h"
 #include "dcpomatic_time.h"
-#include <boost/weak_ptr.hpp>
 
 namespace dcp {
 	class SubtitleAsset;
@@ -37,7 +36,7 @@ class Film;
 class SubtitleEncoder : public Encoder
 {
 public:
-	SubtitleEncoder (boost::shared_ptr<const Film> film, boost::shared_ptr<Job> job, boost::filesystem::path output, bool split_reels);
+	SubtitleEncoder (std::shared_ptr<const Film> film, std::shared_ptr<Job> job, boost::filesystem::path output, std::string intial_name, bool split_reels, bool include_font);
 
 	void go ();
 
@@ -51,10 +50,12 @@ public:
 private:
 	void text (PlayerText subs, TextType type, boost::optional<DCPTextTrack> track, dcpomatic::DCPTimePeriod period);
 
-	std::vector<std::pair<boost::shared_ptr<dcp::SubtitleAsset>, boost::filesystem::path> > _assets;
+	std::vector<std::pair<std::shared_ptr<dcp::SubtitleAsset>, boost::filesystem::path> > _assets;
 	std::vector<dcpomatic::DCPTimePeriod> _reels;
 	bool _split_reels;
+	bool _include_font;
 	int _reel_index;
 	boost::optional<dcpomatic::DCPTime> _last;
 	dcpomatic::DCPTime _length;
+	dcp::ArrayData _default_font;
 };