Rename ReferencedReelAsset -> ReusableReelAsset.

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<dcp::ReelPictureAsset>
-ReelWriter::create_reel_picture(shared_ptr<dcp::Reel> reel, list<ReferencedReelAsset> const & refs) const
+ReelWriter::create_reel_picture(shared_ptr<dcp::Reel> reel, list<ReusableReelAsset> const & refs) const
 {
 	shared_ptr<dcp::ReelPictureAsset> reel_asset;
 
@@ -541,7 +541,7 @@ ReelWriter::create_reel_picture(shared_ptr<dcp::Reel> reel, list<ReferencedReelA
 
 
 void
-ReelWriter::create_reel_sound(shared_ptr<dcp::Reel> reel, list<ReferencedReelAsset> const & refs) const
+ReelWriter::create_reel_sound(shared_ptr<dcp::Reel> reel, list<ReusableReelAsset> const & refs) const
 {
 	shared_ptr<dcp::ReelSoundAsset> reel_asset;
 
@@ -587,7 +587,7 @@ ReelWriter::create_reel_sound(shared_ptr<dcp::Reel> reel, list<ReferencedReelAss
 void
 ReelWriter::create_reel_text(
 	shared_ptr<dcp::Reel> reel,
-	list<ReferencedReelAsset> const & refs,
+	list<ReusableReelAsset> const & refs,
 	int64_t duration,
 	boost::filesystem::path output_dcp,
 	bool ensure_subtitles,
@@ -666,7 +666,7 @@ ReelWriter::create_reel_markers(shared_ptr<dcp::Reel> reel) const
  */
 shared_ptr<dcp::Reel>
 ReelWriter::create_reel(
-	list<ReferencedReelAsset> const & refs,
+	list<ReusableReelAsset> const & refs,
 	boost::filesystem::path output_dcp,
 	bool ensure_subtitles,
 	set<DCPTextTrack> 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<dcp::Reel> create_reel(
-		std::list<ReferencedReelAsset> const & refs,
+		std::list<ReusableReelAsset> const & refs,
 		boost::filesystem::path output_dcp,
 		bool ensure_subtitles,
 		std::set<DCPTextTrack> ensure_closed_captions
@@ -110,11 +110,11 @@ private:
 	bool existing_picture_frame_ok(dcp::File& asset_file, Frame frame);
 	std::shared_ptr<dcp::TextAsset> empty_text_asset(TextType type, boost::optional<DCPTextTrack> track, bool with_dummy) const;
 
-	std::shared_ptr<dcp::ReelPictureAsset> create_reel_picture(std::shared_ptr<dcp::Reel> reel, std::list<ReferencedReelAsset> const & refs) const;
-	void create_reel_sound(std::shared_ptr<dcp::Reel> reel, std::list<ReferencedReelAsset> const & refs) const;
+	std::shared_ptr<dcp::ReelPictureAsset> create_reel_picture(std::shared_ptr<dcp::Reel> reel, std::list<ReusableReelAsset> const & refs) const;
+	void create_reel_sound(std::shared_ptr<dcp::Reel> reel, std::list<ReusableReelAsset> const & refs) const;
 	void create_reel_text(
 		std::shared_ptr<dcp::Reel> reel,
-		std::list<ReferencedReelAsset> const & refs,
+		std::list<ReusableReelAsset> 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<ReferencedReelAsset>& a, shared_ptr<dcp::ReelAsset> r, Frame reel_trim_start, Frame reel_trim_end, DCPTime from, int const ffr)
+maybe_add_asset(list<ReusableReelAsset>& a, shared_ptr<dcp::ReelAsset> 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<ReferencedReelAsset>& a, shared_ptr<dcp::ReelAsset> r, Fra
 
 
 /** @return Details of all the DCP assets in a playlist that are marked to refer to */
-list<ReferencedReelAsset>
-get_referenced_reel_assets(shared_ptr<const Film> film, shared_ptr<const Playlist> playlist)
+list<ReusableReelAsset>
+get_reusable_reel_assets(shared_ptr<const Film> film, shared_ptr<const Playlist> playlist)
 {
-	list<ReferencedReelAsset> reel_assets;
+	list<ReusableReelAsset> reel_assets;
 
 	for (auto content: playlist->content()) {
 		auto dcp = dynamic_pointer_cast<DCPContent>(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<dcp::ReelAsset> asset_, dcpomatic::DCPTimePeriod period_)
+	ReusableReelAsset (std::shared_ptr<dcp::ReelAsset> asset_, dcpomatic::DCPTimePeriod period_)
 		: asset (asset_)
 		, period (period_)
 	{}
@@ -46,7 +46,7 @@ public:
 };
 
 
-std::list<ReferencedReelAsset> get_referenced_reel_assets(std::shared_ptr<const Film> film, std::shared_ptr<const Playlist> playlist);
+std::list<ReusableReelAsset> get_reusable_reel_assets(std::shared_ptr<const Film> film, std::shared_ptr<const Playlist> 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<const AudioBuffers>, dcpomatic::DCPTime time);
 	void write(PlayerText text, TextType type, boost::optional<DCPTextTrack>, dcpomatic::DCPTimePeriod period);
 	void write(std::vector<std::shared_ptr<dcpomatic::Font>> fonts);
-	void write(ReferencedReelAsset asset);
+	void write(ReusableReelAsset asset);
 	void write(std::shared_ptr<const dcp::AtmosFrame> atmos, dcpomatic::DCPTime time, AtmosMetadata metadata);
 	void write(std::shared_ptr<dcp::MonoMPEG2PictureFrame> image, Frame frame);
 	void finish();
@@ -211,7 +211,7 @@ private:
 	boost::mutex _digest_progresses_mutex;
 	std::map<int, std::pair<int64_t, int64_t>> _digest_progresses;
 
-	std::list<ReferencedReelAsset> _reel_assets;
+	std::list<ReusableReelAsset> _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)));