diff options
| author | Carl Hetherington <cth@carlh.net> | 2023-09-17 23:44:03 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2023-09-17 23:44:09 +0200 |
| commit | f96f38c99d7ca810e70e2fb007039c240e14c4bf (patch) | |
| tree | aaa2921a27e9d456342549b90d995ae6b684575b /src/lib | |
| parent | 45f029ce9688a38b8271aa3d23abde1c4d3a31d2 (diff) | |
Remove default DCP audio channel setting (already taken from template).
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/config.cc | 5 | ||||
| -rw-r--r-- | src/lib/config.h | 9 | ||||
| -rw-r--r-- | src/lib/film.cc | 2 |
3 files changed, 1 insertions, 15 deletions
diff --git a/src/lib/config.cc b/src/lib/config.cc index 923116f3a..32d881a76 100644 --- 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 57de737e3..57b9b95bc 100644 --- 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 f807619f3..0d76f6831 100644 --- 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 ()) |