diff options
| -rw-r--r-- | src/lib/config.cc | 5 | ||||
| -rw-r--r-- | src/lib/config.h | 10 | ||||
| -rw-r--r-- | src/lib/film.cc | 4 |
3 files changed, 2 insertions, 17 deletions
diff --git a/src/lib/config.cc b/src/lib/config.cc index af97c7af7..9c884670f 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -110,8 +110,6 @@ Config::set_defaults() _show_experimental_audio_processors = false; _language = optional<string>(); _default_still_length = 10; - _default_dcp_content_type = DCPContentType::from_isdcf_name("FTR"); - _default_dcp_audio_channels = 8; _default_video_bit_rate[VideoEncoding::JPEG2000] = 150000000; _default_video_bit_rate[VideoEncoding::MPEG2] = 5000000; _default_audio_delay = 0; @@ -358,9 +356,6 @@ try _language = f.optional_string_child("Language"); - _default_dcp_content_type = DCPContentType::from_isdcf_name(f.optional_string_child("DefaultDCPContentType").get_value_or("FTR")); - _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")) { diff --git a/src/lib/config.h b/src/lib/config.h index d8ff70db8..582e90cf9 100644 --- a/src/lib/config.h +++ b/src/lib/config.h @@ -214,14 +214,6 @@ public: return _default_still_length; } - DCPContentType const * default_dcp_content_type() const { - return _default_dcp_content_type; - } - - int default_dcp_audio_channels() const { - return _default_dcp_audio_channels; - } - std::string dcp_issuer() const { return _dcp_issuer; } @@ -1399,8 +1391,6 @@ private: boost::optional<std::string> _language; /** Default length of still image content (seconds) */ int _default_still_length; - DCPContentType const * _default_dcp_content_type; - 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 e2e2de111..9a8d36072 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -165,13 +165,13 @@ int const Film::current_state_version = 39; Film::Film(optional<boost::filesystem::path> dir) : _playlist(new Playlist) , _use_isdcf_name(Config::instance()->use_isdcf_name_by_default()) - , _dcp_content_type(Config::instance()->default_dcp_content_type()) + , _dcp_content_type(DCPContentType::from_isdcf_name("FTR")) , _container(Ratio::from_id("185")) , _resolution(Resolution::TWO_K) , _encrypted(false) , _context_id(dcp::make_uuid()) , _video_frame_rate(24) - , _audio_channels(Config::instance()->default_dcp_audio_channels()) + , _audio_channels(6) , _three_d(false) , _sequence(true) , _interop(Config::instance()->default_interop()) |