From cf35ff2053dbf6b6de4f2e5bfcecbcfda3b48dc5 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 7 Feb 2026 21:08:46 +0100 Subject: Rename ReferencedReelAsset -> ReusableReelAsset. --- src/lib/dcp_film_encoder.cc | 2 +- src/lib/player.h | 2 +- src/lib/reel_writer.cc | 8 ++++---- src/lib/reel_writer.h | 8 ++++---- src/lib/reusable_reel_asset.cc | 10 +++++----- src/lib/reusable_reel_asset.h | 6 +++--- src/lib/writer.cc | 2 +- src/lib/writer.h | 6 +++--- test/vf_test.cc | 2 +- 9 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/lib/dcp_film_encoder.cc b/src/lib/dcp_film_encoder.cc index c84816b10..b1a847721 100644 --- a/src/lib/dcp_film_encoder.cc +++ b/src/lib/dcp_film_encoder.cc @@ -134,7 +134,7 @@ DCPFilmEncoder::go() } } - for (auto i: get_referenced_reel_assets(_film, _film->playlist())) { + for (auto i: get_reusable_reel_assets(_film, _film->playlist())) { _writer->write(i); } diff --git a/src/lib/player.h b/src/lib/player.h index b177a98d2..19b3c1c4a 100644 --- a/src/lib/player.h +++ b/src/lib/player.h @@ -53,7 +53,7 @@ class Content; class Film; class PlayerVideo; class Playlist; -class ReferencedReelAsset; +class ReusableReelAsset; class PlayerProperty diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc index 1856ad80b..b2e73d3be 100644 --- a/src/lib/reel_writer.cc +++ b/src/lib/reel_writer.cc @@ -491,7 +491,7 @@ ReelWriter::maybe_add_text( shared_ptr -ReelWriter::create_reel_picture(shared_ptr reel, list const & refs) const +ReelWriter::create_reel_picture(shared_ptr reel, list const & refs) const { shared_ptr reel_asset; @@ -541,7 +541,7 @@ ReelWriter::create_reel_picture(shared_ptr reel, list reel, list const & refs) const +ReelWriter::create_reel_sound(shared_ptr reel, list const & refs) const { shared_ptr reel_asset; @@ -587,7 +587,7 @@ ReelWriter::create_reel_sound(shared_ptr reel, list reel, - list const & refs, + list const & refs, int64_t duration, boost::filesystem::path output_dcp, bool ensure_subtitles, @@ -666,7 +666,7 @@ ReelWriter::create_reel_markers(shared_ptr reel) const */ shared_ptr ReelWriter::create_reel( - list const & refs, + list const & refs, boost::filesystem::path output_dcp, bool ensure_subtitles, set ensure_closed_captions diff --git a/src/lib/reel_writer.h b/src/lib/reel_writer.h index f9234eb23..a96a8319d 100644 --- a/src/lib/reel_writer.h +++ b/src/lib/reel_writer.h @@ -85,7 +85,7 @@ public: void finish(boost::filesystem::path output_dcp); std::shared_ptr create_reel( - std::list const & refs, + std::list const & refs, boost::filesystem::path output_dcp, bool ensure_subtitles, std::set ensure_closed_captions @@ -110,11 +110,11 @@ private: bool existing_picture_frame_ok(dcp::File& asset_file, Frame frame); std::shared_ptr empty_text_asset(TextType type, boost::optional track, bool with_dummy) const; - std::shared_ptr create_reel_picture(std::shared_ptr reel, std::list const & refs) const; - void create_reel_sound(std::shared_ptr reel, std::list const & refs) const; + std::shared_ptr create_reel_picture(std::shared_ptr reel, std::list const & refs) const; + void create_reel_sound(std::shared_ptr reel, std::list const & refs) const; void create_reel_text( std::shared_ptr reel, - std::list const & refs, + std::list const& refs, int64_t duration, boost::filesystem::path output_dcp, bool ensure_subtitles, diff --git a/src/lib/reusable_reel_asset.cc b/src/lib/reusable_reel_asset.cc index 04d6dcce3..06471010c 100644 --- a/src/lib/reusable_reel_asset.cc +++ b/src/lib/reusable_reel_asset.cc @@ -43,14 +43,14 @@ using namespace dcpomatic; static void -maybe_add_asset (list& a, shared_ptr r, Frame reel_trim_start, Frame reel_trim_end, DCPTime from, int const ffr) +maybe_add_asset(list& a, shared_ptr r, Frame reel_trim_start, Frame reel_trim_end, DCPTime from, int const ffr) { DCPOMATIC_ASSERT (r); r->set_entry_point (r->entry_point().get_value_or(0) + reel_trim_start); r->set_duration (r->actual_duration() - reel_trim_start - reel_trim_end); if (r->actual_duration() > 0) { a.push_back ( - ReferencedReelAsset(r, DCPTimePeriod(from, from + DCPTime::from_frames(r->actual_duration(), ffr))) + ReusableReelAsset(r, DCPTimePeriod(from, from + DCPTime::from_frames(r->actual_duration(), ffr))) ); } } @@ -58,10 +58,10 @@ maybe_add_asset (list& a, shared_ptr r, Fra /** @return Details of all the DCP assets in a playlist that are marked to refer to */ -list -get_referenced_reel_assets(shared_ptr film, shared_ptr playlist) +list +get_reusable_reel_assets(shared_ptr film, shared_ptr playlist) { - list reel_assets; + list reel_assets; for (auto content: playlist->content()) { auto dcp = dynamic_pointer_cast(content); diff --git a/src/lib/reusable_reel_asset.h b/src/lib/reusable_reel_asset.h index df6976f5e..0ad4d0799 100644 --- a/src/lib/reusable_reel_asset.h +++ b/src/lib/reusable_reel_asset.h @@ -31,10 +31,10 @@ class Film; class Playlist; -class ReferencedReelAsset +class ReusableReelAsset { public: - ReferencedReelAsset (std::shared_ptr asset_, dcpomatic::DCPTimePeriod period_) + ReusableReelAsset (std::shared_ptr asset_, dcpomatic::DCPTimePeriod period_) : asset (asset_) , period (period_) {} @@ -46,7 +46,7 @@ public: }; -std::list get_referenced_reel_assets(std::shared_ptr film, std::shared_ptr playlist); +std::list get_reusable_reel_assets(std::shared_ptr film, std::shared_ptr playlist); #endif diff --git a/src/lib/writer.cc b/src/lib/writer.cc index 20bf2cab8..72d501958 100644 --- a/src/lib/writer.cc +++ b/src/lib/writer.cc @@ -861,7 +861,7 @@ Writer::set_encoder_threads(int threads) void -Writer::write(ReferencedReelAsset asset) +Writer::write(ReusableReelAsset asset) { _reel_assets.push_back(asset); diff --git a/src/lib/writer.h b/src/lib/writer.h index eca2c2a9a..9358cfa9e 100644 --- a/src/lib/writer.h +++ b/src/lib/writer.h @@ -53,7 +53,7 @@ class AudioBuffers; class Film; class Job; class ReelWriter; -class ReferencedReelAsset; +class ReusableReelAsset; struct writer_disambiguate_font_ids1; struct writer_disambiguate_font_ids2; struct writer_disambiguate_font_ids3; @@ -121,7 +121,7 @@ public: void write(std::shared_ptr, dcpomatic::DCPTime time); void write(PlayerText text, TextType type, boost::optional, dcpomatic::DCPTimePeriod period); void write(std::vector> fonts); - void write(ReferencedReelAsset asset); + void write(ReusableReelAsset asset); void write(std::shared_ptr atmos, dcpomatic::DCPTime time, AtmosMetadata metadata); void write(std::shared_ptr image, Frame frame); void finish(); @@ -211,7 +211,7 @@ private: boost::mutex _digest_progresses_mutex; std::map> _digest_progresses; - std::list _reel_assets; + std::list _reel_assets; FontIdMap _fonts; /** If we are given many fonts, but we're making an Interop DCP, we'll choose a single diff --git a/test/vf_test.cc b/test/vf_test.cc index 71f4366f2..cafd5fe90 100644 --- a/test/vf_test.cc +++ b/test/vf_test.cc @@ -266,9 +266,9 @@ BOOST_AUTO_TEST_CASE(vf_test5) make_and_verify_dcp(vf, {dcp::VerificationNote::Code::EXTERNAL_ASSET}, false); /* Check that the selected reel assets are right */ - auto a = get_referenced_reel_assets(vf, vf->playlist()); BOOST_REQUIRE_EQUAL(a.size(), 4U); auto i = a.begin(); + auto a = get_reusable_reel_assets(vf, vf->playlist()); BOOST_CHECK(i->period == DCPTimePeriod(DCPTime(0), DCPTime(960000))); ++i; BOOST_CHECK(i->period == DCPTimePeriod(DCPTime(0), DCPTime(960000))); -- cgit v1.2.3