White space: subtitle_film_encoder.{cc,h}

2 files changed, 34 insertions, 35 deletions

diff --git a/src/lib/subtitle_film_encoder.cc b/src/lib/subtitle_film_encoder.cc
index 2f1fc7099..6130ce194 100644
--- a/src/lib/subtitle_film_encoder.cc
+++ b/src/lib/subtitle_film_encoder.cc
@@ -51,10 +51,10 @@ using namespace boost::placeholders;
  */
 SubtitleFilmEncoder::SubtitleFilmEncoder(shared_ptr<const Film> film, shared_ptr<Job> job, boost::filesystem::path output, string initial_name, bool split_reels, bool include_font)
 	: FilmEncoder(film, job)
-	, _split_reels (split_reels)
-	, _include_font (include_font)
-	, _reel_index (0)
-	, _length (film->length())
+	, _split_reels(split_reels)
+	, _include_font(include_font)
+	, _reel_index(0)
+	, _length(film->length())
 {
 	_player.set_play_referenced();
 	_player.set_ignore_video();
@@ -81,10 +81,10 @@ SubtitleFilmEncoder::SubtitleFilmEncoder(shared_ptr<const Film> film, shared_ptr
 	}
 
 	for (auto i: film->reels()) {
-		_reels.push_back (i);
+		_reels.push_back(i);
 	}
 
-	_default_font = dcp::ArrayData (default_font_file());
+	_default_font = dcp::ArrayData(default_font_file());
 }
 
 
@@ -92,9 +92,9 @@ void
 SubtitleFilmEncoder::go()
 {
 	{
-		shared_ptr<Job> job = _job.lock ();
-		DCPOMATIC_ASSERT (job);
-		job->sub (_("Extracting"));
+		shared_ptr<Job> job = _job.lock();
+		DCPOMATIC_ASSERT(job);
+		job->sub(_("Extracting"));
 	}
 
 	_reel_index = 0;
@@ -107,13 +107,13 @@ SubtitleFilmEncoder::go()
 			/* No subtitles arrived for this asset; make an empty one so we write something to the output */
 			if (_film->interop()) {
 				auto s = make_shared<dcp::InteropTextAsset>();
-				s->set_movie_title (_film->name());
+				s->set_movie_title(_film->name());
 				s->set_reel_number(fmt::to_string(reel + 1));
 				i.first = s;
 			} else {
 				auto s = make_shared<dcp::SMPTETextAsset>();
-				s->set_content_title_text (_film->name());
-				s->set_reel_number (reel + 1);
+				s->set_content_title_text(_film->name());
+				s->set_reel_number(reel + 1);
 				i.first = s;
 			}
 		}
@@ -124,7 +124,7 @@ SubtitleFilmEncoder::go()
 			}
 		}
 
-		i.first->write (i.second);
+		i.first->write(i.second);
 		++reel;
 	}
 }
@@ -140,9 +140,9 @@ SubtitleFilmEncoder::text(PlayerText subs, TextType type, optional<DCPTextTrack>
 	if (!_assets[_reel_index].first) {
 		shared_ptr<dcp::TextAsset> asset;
 		auto const lang = _film->open_text_languages();
-		if (_film->interop ()) {
+		if (_film->interop()) {
 			auto s = make_shared<dcp::InteropTextAsset>();
-			s->set_movie_title (_film->name());
+			s->set_movie_title(_film->name());
 			if (lang.first) {
 				s->set_language(lang.first->as_string());
 			}
@@ -150,18 +150,18 @@ SubtitleFilmEncoder::text(PlayerText subs, TextType type, optional<DCPTextTrack>
 			_assets[_reel_index].first = s;
 		} else {
 			auto s = make_shared<dcp::SMPTETextAsset>();
-			s->set_content_title_text (_film->name());
+			s->set_content_title_text(_film->name());
 			if (lang.first) {
-				s->set_language (*lang.first);
+				s->set_language(*lang.first);
 			} else if (track->language) {
-				s->set_language (track->language.get());
+				s->set_language(track->language.get());
 			}
-			s->set_edit_rate (dcp::Fraction (_film->video_frame_rate(), 1));
-			s->set_reel_number (_reel_index + 1);
-			s->set_time_code_rate (_film->video_frame_rate());
-			s->set_start_time (dcp::Time());
-			if (_film->encrypted ()) {
-				s->set_key (_film->key ());
+			s->set_edit_rate(dcp::Fraction(_film->video_frame_rate(), 1));
+			s->set_reel_number(_reel_index + 1);
+			s->set_time_code_rate(_film->video_frame_rate());
+			s->set_start_time(dcp::Time());
+			if (_film->encrypted()) {
+				s->set_key(_film->key());
 			}
 			_assets[_reel_index].first = s;
 		}
@@ -169,10 +169,10 @@ SubtitleFilmEncoder::text(PlayerText subs, TextType type, optional<DCPTextTrack>
 
 	for (auto i: subs.string) {
 		/* XXX: couldn't / shouldn't we use period here rather than getting time from the subtitle? */
-		i.set_in  (i.in());
-		i.set_out (i.out());
+		i.set_in (i.in());
+		i.set_out(i.out());
 		if (_film->interop() && !_include_font) {
-			i.unset_font ();
+			i.unset_font();
 		}
 		_assets[_reel_index].first->add(make_shared<dcp::TextString>(i));
 	}
@@ -183,9 +183,8 @@ SubtitleFilmEncoder::text(PlayerText subs, TextType type, optional<DCPTextTrack>
 
 	_last = period.from;
 
-	auto job = _job.lock ();
-	if (job) {
-		job->set_progress (float(period.from.get()) / _length.get());
+	if (auto job = _job.lock()) {
+		job->set_progress(float(period.from.get()) / _length.get());
 	}
 }
 
diff --git a/src/lib/subtitle_film_encoder.h b/src/lib/subtitle_film_encoder.h
index 6482916cb..e2b6dd208 100644
--- a/src/lib/subtitle_film_encoder.h
+++ b/src/lib/subtitle_film_encoder.h
@@ -34,24 +34,24 @@ class Film;
 
 
 /** @class SubtitleFilmEncoder.
- *  @brief An `encoder' which extracts a film's subtitles to DCP XML format.
+ *  @brief An `encoder' which extracts a film's subtitles to DCP XML or MXF format.
  */
 class SubtitleFilmEncoder : public FilmEncoder
 {
 public:
 	SubtitleFilmEncoder(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;
+	void go() override;
 
 	/** @return the number of frames that are done */
-	Frame frames_done () const override;
+	Frame frames_done() const override;
 
-	bool finishing () const override {
+	bool finishing() const override {
 		return false;
 	}
 
 private:
-	void text (PlayerText subs, TextType type, boost::optional<DCPTextTrack> track, dcpomatic::DCPTimePeriod period);
+	void text(PlayerText subs, TextType type, boost::optional<DCPTextTrack> track, dcpomatic::DCPTimePeriod period);
 
 	std::vector<std::pair<std::shared_ptr<dcp::TextAsset>, boost::filesystem::path>> _assets;
 	std::vector<dcpomatic::DCPTimePeriod> _reels;