X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsubtitle_encoder.h;h=0815b1fffbca7e8e02487a8fdfd5664205a81214;hb=0232d80a625b2ffae687e6473ab3fc2603cf87ea;hp=a88c6c5bfc66f748fb8465b5340448b972e76130;hpb=689fa55d1529ad88449ca464e9107c4dcc54d1cb;p=dcpomatic.git

diff --git a/src/lib/subtitle_encoder.h b/src/lib/subtitle_encoder.h
index a88c6c5bf..0815b1fff 100644
--- a/src/lib/subtitle_encoder.h
+++ b/src/lib/subtitle_encoder.h
@@ -19,11 +19,10 @@
 */
 
 
-#include "types.h"
-#include "player_text.h"
 #include "dcp_text_track.h"
-#include "encoder.h"
 #include "dcpomatic_time.h"
+#include "encoder.h"
+#include "player_text.h"
 
 
 namespace dcp {
@@ -40,21 +39,21 @@ class Film;
 class SubtitleEncoder : public Encoder
 {
 public:
-	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);
+	SubtitleEncoder (std::shared_ptr<const Film> film, std::shared_ptr<Job> job, boost::filesystem::path output, std::string initial_name, bool split_reels, bool include_font);
 
 	void go () override;
 
 	/** @return the number of frames that are done */
-	Frame frames_done () const;
+	Frame frames_done () const override;
 
-	bool finishing () const {
+	bool finishing () const override {
 		return false;
 	}
 
 private:
 	void text (PlayerText subs, TextType type, boost::optional<DCPTextTrack> track, dcpomatic::DCPTimePeriod period);
 
-	std::vector<std::pair<std::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;