Remove default DCP audio channel setting (already taken from template).

diff --git a/src/lib/config.cc b/src/lib/config.cc
index 923116f3af2cab70eac3464c15dbc8bea70e3a2a..32d881a762194ff9fbbe68b14eb1fffb5d4b96b4 100644 (file)
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -105,7 +105,6 @@ Config::set_defaults ()
        _show_experimental_audio_processors = false;
        _language = optional<string> ();
        _default_still_length = 10;
-       _default_dcp_audio_channels = 8;
        _default_j2k_bandwidth = 150000000;
        _default_audio_delay = 0;
        _default_interop = false;
@@ -338,8 +337,6 @@ try
 
        _language = f.optional_string_child ("Language");
 
-       _default_dcp_audio_channels = f.optional_number_child<int>("DefaultDCPAudioChannels").get_value_or (6);
-
        if (f.optional_string_child ("DCPMetadataIssuer")) {
                _dcp_issuer = f.string_child ("DCPMetadataIssuer");
        } else if (f.optional_string_child ("DCPIssuer")) {
@@ -755,8 +752,6 @@ Config::write_config () const
                /* [XML:opt] Language Language to use in the GUI e.g. <code>fr_FR</code>. */
                root->add_child("Language")->add_child_text (_language.get());
        }
-       /* [XML] DefaultDCPAudioChannels Default number of audio channels to use when creating new films. */
-       root->add_child("DefaultDCPAudioChannels")->add_child_text (raw_convert<string> (_default_dcp_audio_channels));
        /* [XML] DCPIssuer Issuer text to write into CPL files. */
        root->add_child("DCPIssuer")->add_child_text (_dcp_issuer);
        /* [XML] DCPCreator Creator text to write into CPL files. */

diff --git a/src/lib/config.h b/src/lib/config.h
index 57de737e3d30e4a9a0c78382e1c1c3416eb633a2..57b9b95bcb3c19a768445a1214f3258557e9c11b 100644 (file)
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -195,10 +195,6 @@ public:
                return _default_still_length;
        }
 
-       int default_dcp_audio_channels () const {
-               return _default_dcp_audio_channels;
-       }
-
        std::string dcp_issuer () const {
                return _dcp_issuer;
        }
@@ -738,10 +734,6 @@ public:
                maybe_set (_default_still_length, s);
        }
 
-       void set_default_dcp_audio_channels (int c) {
-               maybe_set (_default_dcp_audio_channels, c);
-       }
-
        void set_dcp_issuer (std::string i) {
                maybe_set (_dcp_issuer, i);
        }
@@ -1322,7 +1314,6 @@ private:
        boost::optional<std::string> _language;
        /** Default length of still image content (seconds) */
        int _default_still_length;
-       int _default_dcp_audio_channels;
        std::string _dcp_issuer;
        std::string _dcp_creator;
        std::string _dcp_company_name;

diff --git a/src/lib/film.cc b/src/lib/film.cc
index f807619f39b14d5eae1195281ffb634e96f53a06..0d76f68310fcbae687c80e6abbc9c27d81b5aa0d 100644 (file)
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -162,7 +162,7 @@ Film::Film (optional<boost::filesystem::path> dir)
        , _context_id (dcp::make_uuid ())
        , _j2k_bandwidth (Config::instance()->default_j2k_bandwidth ())
        , _video_frame_rate (24)
-       , _audio_channels (Config::instance()->default_dcp_audio_channels ())
+       , _audio_channels(8)
        , _three_d (false)
        , _sequence (true)
        , _interop (Config::instance()->default_interop ())

diff --git a/src/wx/full_config_dialog.cc b/src/wx/full_config_dialog.cc
index 6280f18f54ea4500728776f88912f2da5b157114..c82e04099db9ae5ca95e06e7e03b48c14a7c023b 100644 (file)
--- a/src/wx/full_config_dialog.cc
+++ b/src/wx/full_config_dialog.cc
@@ -304,10 +304,6 @@ private:
 #endif
                table->Add (_directory, 1, wxEXPAND);
 
-               add_label_to_sizer (table, _panel, _("Default DCP audio channels"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
-               _dcp_audio_channels = new wxChoice (_panel, wxID_ANY);
-               table->Add (_dcp_audio_channels);
-
                {
                        add_label_to_sizer (table, _panel, _("Default JPEG2000 bandwidth"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
                        auto s = new wxBoxSizer (wxHORIZONTAL);
@@ -390,10 +386,6 @@ private:
 
                _use_isdcf_name_by_default->bind(&DefaultsPage::use_isdcf_name_by_default_changed, this);
 
-               setup_audio_channels_choice (_dcp_audio_channels, 2);
-
-               _dcp_audio_channels->Bind (wxEVT_CHOICE, boost::bind (&DefaultsPage::dcp_audio_channels_changed, this));
-
                _j2k_bandwidth->SetRange (50, 250);
                _j2k_bandwidth->Bind (wxEVT_SPINCTRL, boost::bind (&DefaultsPage::j2k_bandwidth_changed, this));
 
@@ -430,7 +422,6 @@ private:
                checked_set (_use_isdcf_name_by_default, config->use_isdcf_name_by_default());
                checked_set (_j2k_bandwidth, config->default_j2k_bandwidth() / 1000000);
                _j2k_bandwidth->SetRange (50, config->maximum_j2k_bandwidth() / 1000000);
-               checked_set (_dcp_audio_channels, locale_convert<string> (config->default_dcp_audio_channels()));
                checked_set (_audio_delay, config->default_audio_delay ());
                checked_set (_standard, config->default_interop() ? 1 : 0);
                auto dal = config->default_audio_language();
@@ -514,16 +505,6 @@ private:
                Config::instance()->set_default_audio_delay (_audio_delay->GetValue());
        }
 
-       void dcp_audio_channels_changed ()
-       {
-               int const s = _dcp_audio_channels->GetSelection ();
-               if (s != wxNOT_FOUND) {
-                       Config::instance()->set_default_dcp_audio_channels (
-                               locale_convert<int>(string_client_data(_dcp_audio_channels->GetClientObject(s)))
-                               );
-               }
-       }
-
        void directory_changed ()
        {
                Config::instance()->set_default_directory (wx_to_std (_directory->GetPath ()));
@@ -619,7 +600,6 @@ private:
        wxSpinCtrl* _kdm_duration;
        wxChoice* _kdm_duration_unit;
        CheckBox* _use_isdcf_name_by_default;
-       wxChoice* _dcp_audio_channels;
        wxChoice* _standard;
        CheckBox* _enable_audio_language;
        LanguageTagWidget* _audio_language;

diff --git a/test/test.cc b/test/test.cc
index 7abdc7dd40424b2d1f14d9088d835e3809520f4d..d11ede0880ce982cdb02aed5f68844ffa2fceedb 100644 (file)
--- a/test/test.cc
+++ b/test/test.cc
@@ -121,7 +121,6 @@ setup_test_config ()
        Config::instance()->set_default_j2k_bandwidth (100000000);
        Config::instance()->set_default_interop (false);
        Config::instance()->set_default_still_length (10);
-       Config::instance()->set_default_dcp_audio_channels(8);
        Config::instance()->set_log_types (
                LogEntry::TYPE_GENERAL | LogEntry::TYPE_WARNING |
                LogEntry::TYPE_ERROR | LogEntry::TYPE_DISK