std::shared_ptr

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

diff --git a/src/lib/subtitle_encoder.h b/src/lib/subtitle_encoder.h
index 50485750d2ee146da8b0f57430aa52d2635eabfd..165d5fcb67792f409b3d8e2060b0fa2a707cc565 100644 (file)
--- 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;
 };