Rename set_play_referenced() -> set_play_reusable().

9 files changed, 32 insertions, 29 deletions

diff --git a/src/lib/analyse_audio_job.cc b/src/lib/analyse_audio_job.cc
index 35da5acdb..4d69d836a 100644
--- a/src/lib/analyse_audio_job.cc
+++ b/src/lib/analyse_audio_job.cc
@@ -90,7 +90,7 @@ AnalyseAudioJob::run()
 	player->set_ignore_video();
 	player->set_ignore_text();
 	player->set_fast();
-	player->set_play_referenced();
+	player->set_play_reusable();
 	player->Audio.connect(bind(&AudioAnalyser::analyse, &_analyser, _1, _2));
 	if (!_whole_film) {
 		player->set_disable_audio_processor();
diff --git a/src/lib/analyse_subtitles_job.cc b/src/lib/analyse_subtitles_job.cc
index f24a7d474..d8c4d7c8d 100644
--- a/src/lib/analyse_subtitles_job.cc
+++ b/src/lib/analyse_subtitles_job.cc
@@ -81,7 +81,7 @@ AnalyseSubtitlesJob::run ()
 	auto player = make_shared<Player>(_film, playlist, false);
 	player->set_ignore_audio ();
 	player->set_fast ();
-	player->set_play_referenced ();
+	player->set_play_reusable();
 	player->Text.connect (bind(&AnalyseSubtitlesJob::analyse, this, _1, _2));
 
 	set_progress_unknown ();
diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc
index 4809d772a..27d0f3a94 100644
--- a/src/lib/dcp_decoder.cc
+++ b/src/lib/dcp_decoder.cc
@@ -139,7 +139,7 @@ DCPDecoder::DCPDecoder(shared_ptr<const Film> film, shared_ptr<const DCPContent>
 		_reels = cpl->reels();
 	}
 
-	set_decode_referenced(false);
+	set_decode_reusable(false);
 
 	_reel = _reels.begin();
 	get_readers();
@@ -176,7 +176,7 @@ DCPDecoder::pass()
 	*/
 	pass_texts(_next, picture_asset->size());
 
-	if ((_j2k_mono_reader || _j2k_stereo_reader || _mpeg2_mono_reader) && (_decode_referenced || !_dcp_content->reference_video())) {
+	if ((_j2k_mono_reader || _j2k_stereo_reader || _mpeg2_mono_reader) && (_decode_reusable || !_dcp_content->reference_video())) {
 		auto const entry_point = (*_reel)->main_picture()->entry_point().get_value_or(0);
 		if (_j2k_mono_reader) {
 			video->emit(
@@ -233,7 +233,7 @@ DCPDecoder::pass()
 		}
 	}
 
-	if (_sound_reader && (_decode_referenced || !_dcp_content->reference_audio())) {
+	if (_sound_reader && (_decode_reusable || !_dcp_content->reference_audio())) {
 		auto const entry_point = (*_reel)->main_sound()->entry_point().get_value_or(0);
 		auto sf = _sound_reader->get_frame(entry_point + frame);
 		auto from = sf->data();
@@ -331,7 +331,7 @@ DCPDecoder::pass_texts(
 	auto const asset = reel_asset->asset();
 	auto const entry_point = reel_asset->entry_point().get_value_or(0);
 
-	if (_decode_referenced || !_dcp_content->reference_text(type)) {
+	if (_decode_reusable || !_dcp_content->reference_text(type)) {
 		auto subs = asset->texts_during(
 			dcp::Time(entry_point + frame, vfr, vfr),
 			dcp::Time(entry_point + frame + 1, vfr, vfr),
@@ -517,15 +517,15 @@ DCPDecoder::seek(ContentTime t, bool accurate)
 
 
 void
-DCPDecoder::set_decode_referenced(bool r)
+DCPDecoder::set_decode_reusable(bool r)
 {
-	_decode_referenced = r;
+	_decode_reusable = r;
 
 	if (video) {
-		video->set_ignore(_dcp_content->reference_video() && !_decode_referenced);
+		video->set_ignore(_dcp_content->reference_video() && !_decode_reusable);
 	}
 	if (audio) {
-		audio->set_ignore(_dcp_content->reference_audio() && !_decode_referenced);
+		audio->set_ignore(_dcp_content->reference_audio() && !_decode_reusable);
 	}
 }
 
diff --git a/src/lib/dcp_decoder.h b/src/lib/dcp_decoder.h
index c85b7c126..dc30526ff 100644
--- a/src/lib/dcp_decoder.h
+++ b/src/lib/dcp_decoder.h
@@ -61,7 +61,7 @@ public:
 		return _reels;
 	}
 
-	void set_decode_referenced(bool r);
+	void set_decode_reusable(bool r);
 	void set_forced_reduction(boost::optional<int> reduction);
 
 	bool pass() override;
@@ -110,7 +110,7 @@ private:
 
 	std::shared_ptr<dcp::MPEG2Decompressor> _mpeg2_decompressor;
 
-	bool _decode_referenced = false;
+	bool _decode_reusable = false;
 	boost::optional<int> _forced_reduction;
 
 	std::string _lazy_digest;
diff --git a/src/lib/ffmpeg_film_encoder.cc b/src/lib/ffmpeg_film_encoder.cc
index 9a9cba79c..16fa49ea0 100644
--- a/src/lib/ffmpeg_film_encoder.cc
+++ b/src/lib/ffmpeg_film_encoder.cc
@@ -79,7 +79,7 @@ FFmpegFilmEncoder::FFmpegFilmEncoder(
 		)
 {
 	_player.set_always_burn_open_subtitles();
-	_player.set_play_referenced();
+	_player.set_play_reusable();
 }
 
 
diff --git a/src/lib/player.cc b/src/lib/player.cc
index a3b60c843..86f6e1082 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -92,7 +92,7 @@ Player::Player(shared_ptr<const Film> film, Image::Alignment subtitle_alignment,
 	, _always_burn_open_subtitles(false)
 	, _fast(false)
 	, _tolerant(tolerant)
-	, _play_referenced(false)
+	, _play_reusable(false)
 	, _audio_merger(film->audio_frame_rate())
 	, _subtitle_alignment(subtitle_alignment)
 {
@@ -110,7 +110,7 @@ Player::Player(shared_ptr<const Film> film, shared_ptr<const Playlist> playlist_
 	, _always_burn_open_subtitles(false)
 	, _fast(false)
 	, _tolerant(tolerant)
-	, _play_referenced(false)
+	, _play_reusable(false)
 	, _audio_merger(film->audio_frame_rate())
 {
 	construct();
@@ -161,7 +161,7 @@ Player::Player(Player&& other)
 	, _always_burn_open_subtitles(other._always_burn_open_subtitles.load())
 	, _fast(other._fast.load())
 	, _tolerant(other._tolerant)
-	, _play_referenced(other._play_referenced.load())
+	, _play_reusable(other._play_reusable.load())
 	, _next_video_time(other._next_video_time)
 	, _next_audio_time(other._next_audio_time)
 	, _dcp_decode_reduction(other._dcp_decode_reduction.load())
@@ -201,7 +201,7 @@ Player::operator=(Player&& other)
 	_always_burn_open_subtitles = other._always_burn_open_subtitles.load();
 	_fast = other._fast.load();
 	_tolerant = other._tolerant;
-	_play_referenced = other._play_referenced.load();
+	_play_reusable = other._play_reusable.load();
 	_next_video_time = other._next_video_time;
 	_next_audio_time = other._next_audio_time;
 	_dcp_decode_reduction = other._dcp_decode_reduction.load();
@@ -306,8 +306,8 @@ Player::setup_pieces()
 		}
 
 		if (auto dcp = dynamic_pointer_cast<DCPDecoder>(decoder)) {
-			dcp->set_decode_referenced(_play_referenced);
-			if (_play_referenced) {
+			dcp->set_decode_reusable(_play_reusable);
+			if (_play_reusable) {
 				dcp->set_forced_reduction(_dcp_decode_reduction);
 			}
 		}
@@ -663,10 +663,10 @@ Player::set_fast()
 
 
 void
-Player::set_play_referenced()
+Player::set_play_reusable()
 {
-	ChangeSignaller<Player, int> cc(this, PlayerProperty::PLAY_REFERENCED);
-	_play_referenced = true;
+	ChangeSignaller<Player, int> cc(this, PlayerProperty::PLAY_REUSABLE);
+	_play_reusable = true;
 	setup_pieces();
 }
 
@@ -757,7 +757,7 @@ Player::pass()
 		LOG_DEBUG_PLAYER("PLY: Calling pass() on {}", earliest_content->content->path(0).string());
 		earliest_content->done = earliest_content->decoder->pass();
 		auto dcp = dynamic_pointer_cast<DCPContent>(earliest_content->content);
-		if (dcp && !_play_referenced) {
+		if (dcp && !_play_reusable) {
 			if (dcp->reference_video()) {
 				_next_video_time = dcp->end(film);
 			}
diff --git a/src/lib/player.h b/src/lib/player.h
index 4a1cf5f55..b177a98d2 100644
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -69,7 +69,7 @@ public:
 	static int constexpr IGNORE_AUDIO = 808;
 	static int constexpr IGNORE_TEXT = 808;
 	static int constexpr ALWAYS_BURN_OPEN_SUBTITLES = 809;
-	static int constexpr PLAY_REFERENCED = 810;
+	static int constexpr PLAY_REUSABLE = 810;
 };
 
 
@@ -104,7 +104,7 @@ public:
 	void set_ignore_text();
 	void set_always_burn_open_subtitles();
 	void set_fast();
-	void set_play_referenced();
+	void set_play_reusable();
 	void set_dcp_decode_reduction(boost::optional<int> reduction);
 	void set_disable_audio_processor();
 
@@ -213,8 +213,11 @@ private:
 	boost::atomic<bool> _fast;
 	/** true if we should keep going in the face of `survivable' errors */
 	bool _tolerant;
-	/** true if we should `play' (i.e output) referenced DCP data (e.g. for preview) */
-	boost::atomic<bool> _play_referenced;
+	/** true if we should `play' (i.e output) reusable DCP data.
+	 *  For example, for a preview we want to play everything even if when making
+	 *  a DCP it would be re-used verbatim or referenced from an OV.
+	 */
+	boost::atomic<bool> _play_reusable;
 
 	/** Time of the next video that we will emit, or the time of the last accurate seek */
 	boost::optional<dcpomatic::DCPTime> _next_video_time;
diff --git a/src/lib/subtitle_film_encoder.cc b/src/lib/subtitle_film_encoder.cc
index 4a29ebcfa..a347957d0 100644
--- a/src/lib/subtitle_film_encoder.cc
+++ b/src/lib/subtitle_film_encoder.cc
@@ -65,7 +65,7 @@ SubtitleFilmEncoder::SubtitleFilmEncoder(
 	, _length(film->length())
 	, _standard(standard)
 {
-	_player.set_play_referenced();
+	_player.set_play_reusable();
 	_player.set_ignore_video();
 	_player.set_ignore_audio();
 	_player.Text.connect(boost::bind(&SubtitleFilmEncoder::text, this, _1, _2, _3, _4));
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index dbda1d7f1..026f8bb6d 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -183,7 +183,7 @@ FilmViewer::set_film(shared_ptr<Film> film)
 	}
 
 	_player->set_always_burn_open_subtitles();
-	_player->set_play_referenced();
+	_player->set_play_reusable();
 
 	_film->Change.connect(boost::bind(&FilmViewer::film_change, this, _1, _2));
 	_film->LengthChange.connect(boost::bind(&FilmViewer::film_length_change, this));