diff options
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/config.cc | 4 | ||||
| -rw-r--r-- | src/lib/config.h | 9 | ||||
| -rw-r--r-- | src/lib/film.cc | 2 |
3 files changed, 1 insertions, 14 deletions
diff --git a/src/lib/config.cc b/src/lib/config.cc index f74c6da1f..ac9a4447a 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -106,7 +106,6 @@ Config::set_defaults () _language = optional<string> (); _default_still_length = 10; _default_audio_delay = 0; - _default_interop = false; _default_metadata.clear (); _upload_after_make_dcp = false; _mail_server = ""; @@ -355,7 +354,6 @@ try _default_still_length = f.optional_number_child<int>("DefaultStillLength").get_value_or (10); _default_audio_delay = f.optional_number_child<int>("DefaultAudioDelay").get_value_or (0); - _default_interop = f.optional_bool_child("DefaultInterop").get_value_or (false); try { auto al = f.optional_string_child("DefaultAudioLanguage"); @@ -769,8 +767,6 @@ Config::write_config () const root->add_child("DefaultStillLength")->add_child_text (raw_convert<string> (_default_still_length)); /* [XML] DefaultAudioDelay Default delay to apply to audio (positive moves audio later) in milliseconds. */ root->add_child("DefaultAudioDelay")->add_child_text (raw_convert<string> (_default_audio_delay)); - /* [XML] DefaultInterop 1 to default new films to Interop, 0 for SMPTE. */ - root->add_child("DefaultInterop")->add_child_text (_default_interop ? "1" : "0"); if (_default_audio_language) { /* [XML] DefaultAudioLanguage Default audio language to use for new films */ root->add_child("DefaultAudioLanguage")->add_child_text(_default_audio_language->to_string()); diff --git a/src/lib/config.h b/src/lib/config.h index b7eef6827..93c2b9cde 100644 --- a/src/lib/config.h +++ b/src/lib/config.h @@ -223,10 +223,6 @@ public: return _default_audio_delay; } - bool default_interop () const { - return _default_interop; - } - boost::optional<dcp::LanguageTag> default_audio_language() const { return _default_audio_language; } @@ -758,10 +754,6 @@ public: maybe_set (_default_audio_delay, d); } - void set_default_interop (bool i) { - maybe_set (_default_interop, i); - } - void set_default_audio_language(dcp::LanguageTag tag) { maybe_set(_default_audio_language, tag); } @@ -1313,7 +1305,6 @@ private: std::string _dcp_product_version; std::string _dcp_j2k_comment; int _default_audio_delay; - bool _default_interop; boost::optional<dcp::LanguageTag> _default_audio_language; boost::optional<dcp::LanguageTag::RegionSubtag> _default_territory; std::map<std::string, std::string> _default_metadata; diff --git a/src/lib/film.cc b/src/lib/film.cc index ba8de10bd..542dbfa74 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -165,7 +165,7 @@ Film::Film (optional<boost::filesystem::path> dir) , _audio_channels(8) , _three_d (false) , _sequence (true) - , _interop (Config::instance()->default_interop ()) + , _interop(false) , _limit_to_smpte_bv20(false) , _audio_processor (0) , _reel_type (ReelType::SINGLE) |