Rename use_source_audio to use_content_audio.

diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index 1cac25ca15e0fcfc5ce5b75823bf4fd4620fca5c..78d0c48c40f4b76bf56e4a73db1ff2807d3b81ab 100644 (file)
--- 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 3ce3a8df34519b70c929e1253ff87f19c9011a68..c38b59d9efde32bedfba6a3e39b5d8861de8f2c7 100644 (file)
--- 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 af1f49e2ef56534dc847123f7183ea3eb1694e3a..0e2a4e5efd6e002f5e9b579423ff2b732d230359 100644 (file)
--- 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 */

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 59210cc0bba0f197894ad051724cde2b9a9fc00a..d1b341bb7a57e00f1f3011d03f9737ad0d38f2da 100644 (file)
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -191,7 +191,7 @@ FilmEditor::connect_to_widgets ()
                wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (FilmEditor::audio_gain_calculate_button_clicked), 0, this
                );
        _audio_delay->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::audio_delay_changed), 0, this);
-       _use_source_audio->Connect (wxID_ANY, wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler (FilmEditor::use_audio_changed), 0, this);
+       _use_content_audio->Connect (wxID_ANY, wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler (FilmEditor::use_audio_changed), 0, this);
        _use_external_audio->Connect (wxID_ANY, wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler (FilmEditor::use_audio_changed), 0, this);
        for (int i = 0; i < MAX_AUDIO_CHANNELS; ++i) {
                _external_audio[i]->Connect (
@@ -291,8 +291,8 @@ FilmEditor::make_audio_panel ()
        }
 
        {
-               _use_source_audio = new wxRadioButton (_audio_panel, wxID_ANY, _("Use source audio"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP);
-               _audio_sizer->Add (video_control (_use_source_audio));
+               _use_content_audio = new wxRadioButton (_audio_panel, wxID_ANY, _("Use content's audio"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP);
+               _audio_sizer->Add (video_control (_use_content_audio));
                wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
                _audio_stream = new wxComboBox (_audio_panel, wxID_ANY, wxT (""), wxDefaultPosition, wxDefaultSize, 0, 0, wxCB_READONLY);
                s->Add (video_control (_audio_stream), 1);
@@ -614,9 +614,9 @@ FilmEditor::film_changed (Film::Property p)
                        checked_set (_subtitle_stream, _film->subtitle_stream().get().to_string());
                }
                break;
-       case Film::USE_SOURCE_AUDIO:
-               checked_set (_use_source_audio, _film->use_source_audio ());
-               checked_set (_use_external_audio, !_film->use_source_audio ());
+       case Film::USE_CONTENT_AUDIO:
+               checked_set (_use_content_audio, _film->use_content_audio ());
+               checked_set (_use_external_audio, !_film->use_content_audio ());
                setup_audio_control_sensitivity ();
                break;
        case Film::EXTERNAL_AUDIO:
@@ -688,7 +688,7 @@ FilmEditor::set_film (shared_ptr<Film> f)
        film_changed (Film::DCP_TRIM_START);
        film_changed (Film::DCP_TRIM_END);
        film_changed (Film::DCP_AB);
-       film_changed (Film::USE_SOURCE_AUDIO);
+       film_changed (Film::USE_CONTENT_AUDIO);
        film_changed (Film::AUDIO_STREAM);
        film_changed (Film::EXTERNAL_AUDIO);
        film_changed (Film::AUDIO_GAIN);
@@ -927,10 +927,10 @@ FilmEditor::setup_subtitle_control_sensitivity ()
 void
 FilmEditor::setup_audio_control_sensitivity ()
 {
-       _use_source_audio->Enable (_generally_sensitive);
+       _use_content_audio->Enable (_generally_sensitive);
        _use_external_audio->Enable (_generally_sensitive);
        
-       bool const source = _generally_sensitive && _use_source_audio->GetValue();
+       bool const source = _generally_sensitive && _use_content_audio->GetValue();
        bool const external = _generally_sensitive && _use_external_audio->GetValue();
 
        _audio_stream->Enable (source);
@@ -1029,7 +1029,7 @@ FilmEditor::active_jobs_changed (bool a)
 void
 FilmEditor::use_audio_changed (wxCommandEvent &)
 {
-       _film->set_use_source_audio (_use_source_audio->GetValue ());
+       _film->set_use_content_audio (_use_content_audio->GetValue ());
        setup_audio_control_sensitivity ();
 }
 

diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index 2890df2441f6afa8be7706d84eff00e9977c072b..428b994b8e6c9beffa6eedcb98fb409705f64de2 100644 (file)
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -132,7 +132,7 @@ private:
        wxButton* _filters_button;
        /** The Film's scaler */
        wxComboBox* _scaler;
-       wxRadioButton* _use_source_audio;
+       wxRadioButton* _use_content_audio;
        wxComboBox* _audio_stream;
        wxRadioButton* _use_external_audio;
        wxFilePickerCtrl* _external_audio[MAX_AUDIO_CHANNELS];