Rename use_source_audio to use_content_audio.

3 files changed, 17 insertions, 16 deletions

diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index 1cac25ca1..78d0c48c4 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -226,7 +226,7 @@ FFmpegDecoder::pass ()
 			process_video (_frame);
 		}
 
-		if (_audio_stream && _opt->decode_audio && _film->use_source_audio()) {
+		if (_audio_stream && _opt->decode_audio && _film->use_content_audio()) {
 			while (avcodec_decode_audio4 (_audio_codec_context, _frame, &frame_finished, &_packet) >= 0 && frame_finished) {
 				int const data_size = av_samples_get_buffer_size (
 					0, _audio_codec_context->channels, _frame->nb_samples, audio_sample_format (), 1
@@ -290,7 +290,7 @@ FFmpegDecoder::pass ()
 			}
 		}
 
-	} else if (_audio_stream && _packet.stream_index == _audio_stream.get().id() && _opt->decode_audio && _film->use_source_audio()) {
+	} else if (_audio_stream && _packet.stream_index == _audio_stream.get().id() && _opt->decode_audio && _film->use_content_audio()) {
 
 		int frame_finished;
 		if (avcodec_decode_audio4 (_audio_codec_context, _frame, &frame_finished, &_packet) >= 0 && frame_finished) {
diff --git a/src/lib/film.cc b/src/lib/film.cc
index 3ce3a8df3..c38b59d9e 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -87,7 +87,7 @@ Film::Film (string d, bool must_exist)
 	, _dcp_trim_start (0)
 	, _dcp_trim_end (0)
 	, _dcp_ab (false)
-	, _use_source_audio (true)
+	, _use_content_audio (true)
 	, _audio_gain (0)
 	, _audio_delay (0)
 	, _still_duration (10)
@@ -145,7 +145,7 @@ Film::Film (Film const & o)
 	, _dcp_trim_start    (o._dcp_trim_start)
 	, _dcp_trim_end      (o._dcp_trim_end)
 	, _dcp_ab            (o._dcp_ab)
-	, _use_source_audio  (o._use_source_audio)
+	, _use_content_audio (o._use_content_audio)
 	, _audio_stream      (o._audio_stream)
 	, _external_audio    (o._external_audio)
 	, _audio_gain        (o._audio_gain)
@@ -418,7 +418,7 @@ Film::write_metadata () const
 	f << "dcp_trim_start " << _dcp_trim_start << "\n";
 	f << "dcp_trim_end " << _dcp_trim_end << "\n";
 	f << "dcp_ab " << (_dcp_ab ? "1" : "0") << "\n";
-	f << "use_source_audio " << (_use_source_audio ? "1" : "0") << "\n";
+	f << "use_content_audio " << (_use_content_audio ? "1" : "0") << "\n";
 	if (_audio_stream) {
 		f << "selected_audio_stream " << _audio_stream.get().to_string() << "\n";
 	}
@@ -512,8 +512,8 @@ Film::read_metadata ()
 			_dcp_trim_end = atoi (v.c_str ());
 		} else if (k == "dcp_ab") {
 			_dcp_ab = (v == "1");
-		} else if (k == "use_source_audio") {
-			_use_source_audio = (v == "1");
+		} else if (k == "use_content_audio") {
+			_use_content_audio = (v == "1");
 		} else if (k == "selected_audio_stream") {
 			_audio_stream = AudioStream (v);
 		} else if (k == "external_audio") {
@@ -1072,13 +1072,13 @@ Film::set_dcp_ab (bool a)
 }
 
 void
-Film::set_use_source_audio (bool s)
+Film::set_use_content_audio (bool s)
 {
 	{
 		boost::mutex::scoped_lock lm (_state_mutex);
-		_use_source_audio = s;
+		_use_content_audio = s;
 	}
-	signal_changed (USE_SOURCE_AUDIO);
+	signal_changed (USE_CONTENT_AUDIO);
 }
 
 void
@@ -1339,7 +1339,7 @@ Film::audio_channels () const
 {
 	boost::mutex::scoped_lock lm (_state_mutex);
 	
-	if (_use_source_audio) {
+	if (_use_content_audio) {
 		if (_audio_stream) {
 			return _audio_stream.get().channels ();
 		}
diff --git a/src/lib/film.h b/src/lib/film.h
index af1f49e2e..0e2a4e5ef 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -120,7 +120,7 @@ public:
 		DCP_TRIM_START,
 		DCP_TRIM_END,
 		DCP_AB,
-		USE_SOURCE_AUDIO,
+		USE_CONTENT_AUDIO,
 		AUDIO_STREAM,
 		EXTERNAL_AUDIO,
 		AUDIO_GAIN,
@@ -202,9 +202,9 @@ public:
 		return _dcp_ab;
 	}
 
-	bool use_source_audio () const {
+	bool use_content_audio () const {
 		boost::mutex::scoped_lock lm (_state_mutex);
-		return _use_source_audio;
+		return _use_content_audio;
 	}
 
 	boost::optional<AudioStream> audio_stream () const {
@@ -341,7 +341,7 @@ public:
 	void set_dcp_trim_start (int);
 	void set_dcp_trim_end (int);
 	void set_dcp_ab (bool);
-	void set_use_source_audio (bool);
+	void set_use_content_audio (bool);
 	void set_audio_stream (boost::optional<AudioStream>);
 	void set_external_audio (std::vector<std::string>);
 	void set_audio_gain (float);
@@ -420,7 +420,8 @@ private:
 	    has the specified filters and post-processing.
 	*/
 	bool _dcp_ab;
-	bool _use_source_audio;
+	/** true to use the audio from the content file, false to use external audio */
+	bool _use_content_audio;
 	boost::optional<AudioStream> _audio_stream;
 	std::vector<std::string> _external_audio;
 	/** Gain to apply to audio in dB */