Add simpler language tag dialog (#1931).

[dcpomatic.git] / src / lib / config.cc

diff --git a/src/lib/config.cc b/src/lib/config.cc
index eda45afff4a166b462be689e978613d6182b41c8..0dcc8411775f5f6e138a4055fa0604cf13b239e5 100644 (file)
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -176,6 +176,7 @@ Config::set_defaults ()
        _player_kdm_directory = boost::none;
        _audio_mapping = boost::none;
        _minimum_frame_size = 65536;
+       _custom_languages.clear ();
 
        _allowed_dcp_frame_rates.clear ();
        _allowed_dcp_frame_rates.push_back (24);
@@ -552,6 +553,15 @@ try
 
        _minimum_frame_size = f.optional_number_child<int>("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) {}
+       }
+
        if (boost::filesystem::exists (_cinemas_file)) {
                cxml::Document f ("Cinemas");
                f.read_file (_cinemas_file);
@@ -665,7 +675,7 @@ Config::write_config () const
        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] DCPIssuer Creator text to write into CPL files. */
+       /* [XML] DCPCreator Creator text to write into CPL files. */
        root->add_child("DCPCreator")->add_child_text (_dcp_creator);
        /* [XML] Company name to write into MXF files. */
        root->add_child("DCPCompanyName")->add_child_text (_dcp_company_name);
@@ -774,8 +784,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 <code>&lt;Certificate&gt;</code>
@@ -976,6 +991,9 @@ Config::write_config () const
                _audio_mapping->as_xml (root->add_child("AudioMapping"));
        }
        root->add_child("MinimumFrameSize")->add_child_text(raw_convert<string>(_minimum_frame_size));
+       for (auto const& i: _custom_languages) {
+               root->add_child("CustomLanguage")->add_child_text(i.to_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 ();
+       }
+}
+