diff options
| author | Carl Hetherington <cth@carlh.net> | 2025-12-20 20:57:02 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2025-12-20 20:57:02 +0100 |
| commit | d482e93271752c1b31b3d2a5219b89c2cd984365 (patch) | |
| tree | c6a3841220d96c6197239f89c5ae5f8fdc9ca2ea | |
| parent | 054e20e8fbc04a9a7bb78b2c4a52f9ca9c817df2 (diff) | |
White space: dcp_film_encoder.{cc,h}
| -rw-r--r-- | src/lib/dcp_film_encoder.cc | 20 | ||||
| -rw-r--r-- | src/lib/dcp_film_encoder.h | 16 |
2 files changed, 18 insertions, 18 deletions
diff --git a/src/lib/dcp_film_encoder.cc b/src/lib/dcp_film_encoder.cc index 631010071..e98dfb423 100644 --- a/src/lib/dcp_film_encoder.cc +++ b/src/lib/dcp_film_encoder.cc @@ -67,8 +67,8 @@ using namespace dcpomatic; DCPFilmEncoder::DCPFilmEncoder(shared_ptr<const Film> film, weak_ptr<Job> job) : FilmEncoder(film, job) , _writer(film, job, film->dir(film->dcp_name())) - , _finishing (false) - , _non_burnt_subtitles (false) + , _finishing(false) + , _non_burnt_subtitles(false) { switch (_film->video_encoding()) { case VideoEncoding::JPEG2000: @@ -89,7 +89,7 @@ DCPFilmEncoder::DCPFilmEncoder(shared_ptr<const Film> film, weak_ptr<Job> job) _player_text_connection = _player.Text.connect(bind(&DCPFilmEncoder::text, this, _1, _2, _3, _4)); _player_atmos_connection = _player.Atmos.connect(bind(&DCPFilmEncoder::atmos, this, _1, _2, _3)); - for (auto c: film->content ()) { + for (auto c: film->content()) { for (auto i: c->text) { if (i->use() && !i->burn()) { _non_burnt_subtitles = true; @@ -101,10 +101,10 @@ DCPFilmEncoder::DCPFilmEncoder(shared_ptr<const Film> film, weak_ptr<Job> job) DCPFilmEncoder::~DCPFilmEncoder() { /* We must stop receiving more video data before we die */ - _player_video_connection.release (); - _player_audio_connection.release (); - _player_text_connection.release (); - _player_atmos_connection.release (); + _player_video_connection.release(); + _player_audio_connection.release(); + _player_text_connection.release(); + _player_atmos_connection.release(); } void @@ -114,9 +114,9 @@ DCPFilmEncoder::go() _encoder->begin(); { - auto job = _job.lock (); - DCPOMATIC_ASSERT (job); - job->sub (_("Encoding")); + auto job = _job.lock(); + DCPOMATIC_ASSERT(job); + job->sub(_("Encoding")); } if (_non_burnt_subtitles) { diff --git a/src/lib/dcp_film_encoder.h b/src/lib/dcp_film_encoder.h index 3c697a115..54a387045 100644 --- a/src/lib/dcp_film_encoder.h +++ b/src/lib/dcp_film_encoder.h @@ -45,13 +45,13 @@ public: DCPFilmEncoder(std::shared_ptr<const Film> film, std::weak_ptr<Job> job); ~DCPFilmEncoder(); - void go () override; + void go() override; - boost::optional<float> current_rate () const override; - Frame frames_done () const override; + boost::optional<float> current_rate() const override; + Frame frames_done() const override; /** @return true if we are in the process of calling Encoder::process_end */ - bool finishing () const override { + bool finishing() const override { return _finishing; } @@ -62,10 +62,10 @@ private: friend struct ::frames_not_lost_when_threads_disappear; - void video (std::shared_ptr<PlayerVideo>, dcpomatic::DCPTime); - void audio (std::shared_ptr<AudioBuffers>, dcpomatic::DCPTime); - void text (PlayerText, TextType, boost::optional<DCPTextTrack>, dcpomatic::DCPTimePeriod); - void atmos (std::shared_ptr<const dcp::AtmosFrame>, dcpomatic::DCPTime, AtmosMetadata metadata); + void video(std::shared_ptr<PlayerVideo>, dcpomatic::DCPTime); + void audio(std::shared_ptr<AudioBuffers>, dcpomatic::DCPTime); + void text(PlayerText, TextType, boost::optional<DCPTextTrack>, dcpomatic::DCPTimePeriod); + void atmos(std::shared_ptr<const dcp::AtmosFrame>, dcpomatic::DCPTime, AtmosMetadata metadata); Writer _writer; std::unique_ptr<VideoEncoder> _encoder; |
