X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.cc;h=ed00d274bd0e78664453ace902e927a9460e7e48;hb=df811a0dd2772417496991b72fde0ef3304241d9;hp=d38256673a8685cf169a24d643bdbaf0e084289b;hpb=40457440bc4fcadf13ba7acf5fb198cdba23c13a;p=dcpomatic.git diff --git a/src/lib/config.cc b/src/lib/config.cc index d38256673..ed00d274b 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -103,7 +103,8 @@ Config::set_defaults () _default_dcp_audio_channels = 6; _default_j2k_bandwidth = 150000000; _default_audio_delay = 0; - _default_interop = true; + _default_interop = false; + _default_metadata.clear (); _upload_after_make_dcp = false; _mail_server = ""; _mail_port = 25; @@ -175,7 +176,8 @@ Config::set_defaults () _player_playlist_directory = boost::none; _player_kdm_directory = boost::none; _audio_mapping = boost::none; - _minimum_frame_size = 65536; + _custom_languages.clear (); + _add_files_path = boost::none; _allowed_dcp_frame_rates.clear (); _allowed_dcp_frame_rates.push_back (24); @@ -308,16 +310,15 @@ try _dcp_product_version = f.optional_string_child("DCPProductVersion").get_value_or(""); _dcp_j2k_comment = f.optional_string_child("DCPJ2KComment").get_value_or(""); - if (version && version.get() >= 2) { - _default_isdcf_metadata = ISDCFMetadata (f.node_child ("ISDCFMetadata")); - } else { - _default_isdcf_metadata = ISDCFMetadata (f.node_child ("DCIMetadata")); - } - _default_still_length = f.optional_number_child("DefaultStillLength").get_value_or (10); _default_j2k_bandwidth = f.optional_number_child("DefaultJ2KBandwidth").get_value_or (200000000); _default_audio_delay = f.optional_number_child("DefaultAudioDelay").get_value_or (0); _default_interop = f.optional_bool_child("DefaultInterop").get_value_or (false); + + for (auto const& i: f.node_children("DefaultMetadata")) { + _default_metadata[i->string_attribute("key")] = i->content(); + } + _default_kdm_directory = f.optional_string_child("DefaultKDMDirectory"); /* Read any cinemas that are still lying around in the config file @@ -550,7 +551,16 @@ try _audio_mapping = AudioMapping (f.node_child("AudioMapping"), Film::current_state_version); } - _minimum_frame_size = f.optional_number_child("MinimumFrameSize").get_value_or(65536); + for (auto i: f.node_children("CustomLanguage")) { + try { + /* This will fail if it's called before dcp::init() as it won't recognise the + * tag. That's OK because the Config will be reloaded again later. + */ + _custom_languages.push_back (dcp::LanguageTag(i->content())); + } catch (std::runtime_error& e) {} + } + + _add_files_path = f.optional_string_child("AddFilesPath"); if (boost::filesystem::exists (_cinemas_file)) { cxml::Document f ("Cinemas"); @@ -678,14 +688,6 @@ Config::write_config () const /* [XML] UploadAfterMakeDCP 1 to upload to a TMS after making a DCP, 0 for no upload. */ root->add_child("UploadAfterMakeDCP")->add_child_text (_upload_after_make_dcp ? "1" : "0"); - /* [XML] ISDCFMetadata Default ISDCF metadata to use for new films; child tags are <ContentVersion>, - <AudioLanguage>, <SubtitleLanguage>, <Territory>, - <Rating>, <Studio>, <Facility>, <TempVersion>, - <PreRelease>, <RedBand>, <Chain>, <TwoDVersionOFThreeD>, - <MasteredLuminance>. - */ - _default_isdcf_metadata.as_xml (root->add_child ("ISDCFMetadata")); - /* [XML] DefaultStillLength Default length (in seconds) for still images in new films. */ root->add_child("DefaultStillLength")->add_child_text (raw_convert (_default_still_length)); /* [XML] DefaultJ2KBandwidth Default bitrate (in bits per second) for JPEG2000 data in new films. */ @@ -694,6 +696,11 @@ Config::write_config () const root->add_child("DefaultAudioDelay")->add_child_text (raw_convert (_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"); + for (auto const& i: _default_metadata) { + auto c = root->add_child("DefaultMetadata"); + c->set_attribute("key", i.first); + c->add_child_text(i.second); + } if (_default_kdm_directory) { /* [XML:opt] DefaultKDMDirectory Default directory to write KDMs to. */ root->add_child("DefaultKDMDirectory")->add_child_text (_default_kdm_directory->string ()); @@ -774,8 +781,13 @@ Config::write_config () const /* [XML] AutomaticAudioAnalysis 1 to run audio analysis automatically when audio content is added to the film, otherwise 0. */ root->add_child("AutomaticAudioAnalysis")->add_child_text (_automatic_audio_analysis ? "1" : "0"); #ifdef DCPOMATIC_WINDOWS - /* [XML] Win32Console 1 to open a console when running on Windows, otherwise 0. */ - root->add_child("Win32Console")->add_child_text (_win32_console ? "1" : "0"); + if (_win32_console) { + /* [XML] Win32Console 1 to open a console when running on Windows, otherwise 0. + * We only write this if it's true, which is a bit of a hack to allow unit tests to work + * more easily on Windows (without a platform-specific reference in config_write_utf8_test) + */ + root->add_child("Win32Console")->add_child_text ("1"); + } #endif /* [XML] Signer Certificate chain and private key to use when signing DCPs and KDMs. Should contain <Certificate> @@ -975,7 +987,13 @@ Config::write_config () const if (_audio_mapping) { _audio_mapping->as_xml (root->add_child("AudioMapping")); } - root->add_child("MinimumFrameSize")->add_child_text(raw_convert(_minimum_frame_size)); + for (auto const& i: _custom_languages) { + root->add_child("CustomLanguage")->add_child_text(i.to_string()); + } + if (_add_files_path) { + /* [XML] The default path that will be offered in the picker when adding files to a film */ + root->add_child("AddFilesPath")->add_child_text(_add_files_path->string()); + } try { auto const s = doc.write_to_string_formatted (); @@ -984,7 +1002,7 @@ Config::write_config () const if (!f) { throw FileError (_("Could not open file for writing"), tmp); } - checked_fwrite (s.c_str(), s.length(), f, tmp); + checked_fwrite (s.c_str(), s.bytes(), f, tmp); fclose (f); boost::filesystem::remove (config_file()); boost::filesystem::rename (tmp, config_file()); @@ -1415,3 +1433,14 @@ Config::set_audio_mapping_to_default () _audio_mapping = audio_mapping (ch); changed (AUDIO_MAPPING); } + + +void +Config::add_custom_language (dcp::LanguageTag tag) +{ + if (find(_custom_languages.begin(), _custom_languages.end(), tag) == _custom_languages.end()) { + _custom_languages.push_back (tag); + changed (); + } +} +