_check_for_test_updates = false;
_maximum_j2k_bandwidth = 250000000;
_log_types = Log::TYPE_GENERAL | Log::TYPE_WARNING | Log::TYPE_ERROR | Log::TYPE_DEBUG;
-#ifdef DCPOMATIC_WINDOWS
+#ifdef DCPOMATIC_WINDOWS
_win32_console = false;
-#endif
+#endif
_allowed_dcp_frame_rates.clear ();
_allowed_dcp_frame_rates.push_back (24);
_allowed_dcp_frame_rates.push_back (50);
_allowed_dcp_frame_rates.push_back (60);
- _colour_conversions.clear ();
- _colour_conversions.push_back (PresetColourConversion (_("sRGB"), dcp::ColourConversion::srgb_to_xyz ()));
- _colour_conversions.push_back (PresetColourConversion (_("Rec. 601"), dcp::ColourConversion::rec601_to_xyz ()));
- _colour_conversions.push_back (PresetColourConversion (_("Rec. 709"), dcp::ColourConversion::rec709_to_xyz ()));
- _colour_conversions.push_back (PresetColourConversion (_("P3 (from SMPTE RP 431-2)"), dcp::ColourConversion::p3_to_xyz ()));
-
set_kdm_email_to_default ();
}
_servers.push_back ((*i)->content ());
}
}
-
+
_tms_ip = f.string_child ("TMSIP");
_tms_path = f.string_child ("TMSPath");
_tms_user = f.string_child ("TMSUser");
} else if (f.optional_string_child ("DCPIssuer")) {
_dcp_issuer = f.string_child ("DCPIssuer");
}
-
+
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<int>("DefaultStillLength").get_value_or (10);
_default_j2k_bandwidth = f.optional_number_child<int>("DefaultJ2KBandwidth").get_value_or (200000000);
_default_audio_delay = f.optional_number_child<int>("DefaultAudioDelay").get_value_or (0);
- list<cxml::NodePtr> cc = f.node_children ("ColourConversion");
-
- if (!cc.empty ()) {
- _colour_conversions.clear ();
- }
-
- try {
- for (list<cxml::NodePtr>::iterator i = cc.begin(); i != cc.end(); ++i) {
- /* This is a bit of a hack; use 32 (the first Film state file version for the 2.x branch)
- for version 2 and 10 (the current Film state version for the 1.x branch) for version 1.
- */
- _colour_conversions.push_back (PresetColourConversion (*i, version == 2 ? 32 : 10));
- }
- } catch (cxml::Error) {
- /* Probably failed to load an old-style ColourConversion tag; just give up */
- _colour_conversions.push_back (PresetColourConversion (_("sRGB"), dcp::ColourConversion::srgb_to_xyz ()));
- _colour_conversions.push_back (PresetColourConversion (_("Rec. 709"), dcp::ColourConversion::rec709_to_xyz ()));
- }
-
list<cxml::NodePtr> cin = f.node_children ("Cinema");
for (list<cxml::NodePtr>::iterator i = cin.begin(); i != cin.end(); ++i) {
/* Slightly grotty two-part construction of Cinema here so that we can use
_allow_any_dcp_frame_rate = f.optional_bool_child ("AllowAnyDCPFrameRate");
_log_types = f.optional_number_child<int> ("LogTypes").get_value_or (Log::TYPE_GENERAL | Log::TYPE_WARNING | Log::TYPE_ERROR);
-#ifdef DCPOMATIC_WINDOWS
+#ifdef DCPOMATIC_WINDOWS
_win32_console = f.optional_bool_child ("Win32Console").get_value_or (false);
-#endif
+#endif
list<cxml::NodePtr> his = f.node_children ("History");
for (list<cxml::NodePtr>::const_iterator i = his.begin(); i != his.end(); ++i) {
Config::file () const
{
boost::filesystem::path p;
+#ifdef DCPOMATIC_OSX
+ p /= g_get_home_dir ();
+ p /= "Library";
+ p /= "Preferences";
+ p /= "com.dcpomatic";
+ p /= "2";
+#else
p /= g_get_user_config_dir ();
- boost::system::error_code ec;
- boost::filesystem::create_directory (p, ec);
p /= "dcpomatic2";
- boost::filesystem::create_directory (p, ec);
+#endif
+ boost::system::error_code ec;
+ boost::filesystem::create_directories (p, ec);
p /= "config.xml";
return p;
}
root->add_child("DefaultDirectory")->add_child_text (_default_directory.string ());
root->add_child("ServerPortBase")->add_child_text (raw_convert<string> (_server_port_base));
root->add_child("UseAnyServers")->add_child_text (_use_any_servers ? "1" : "0");
-
+
for (vector<string>::const_iterator i = _servers.begin(); i != _servers.end(); ++i) {
root->add_child("Server")->add_child_text (*i);
}
root->add_child("DefaultJ2KBandwidth")->add_child_text (raw_convert<string> (_default_j2k_bandwidth));
root->add_child("DefaultAudioDelay")->add_child_text (raw_convert<string> (_default_audio_delay));
- for (vector<PresetColourConversion>::const_iterator i = _colour_conversions.begin(); i != _colour_conversions.end(); ++i) {
- i->as_xml (root->add_child ("ColourConversion"));
- }
-
for (list<shared_ptr<Cinema> >::const_iterator i = _cinemas.begin(); i != _cinemas.end(); ++i) {
(*i)->as_xml (root->add_child ("Cinema"));
}
root->add_child("MaximumJ2KBandwidth")->add_child_text (raw_convert<string> (_maximum_j2k_bandwidth));
root->add_child("AllowAnyDCPFrameRate")->add_child_text (_allow_any_dcp_frame_rate ? "1" : "0");
root->add_child("LogTypes")->add_child_text (raw_convert<string> (_log_types));
-#ifdef DCPOMATIC_WINDOWS
+#ifdef DCPOMATIC_WINDOWS
root->add_child("Win32Console")->add_child_text (_win32_console ? "1" : "0");
-#endif
+#endif
xmlpp::Element* signer = root->add_child ("Signer");
dcp::CertificateChain::List certs = _signer->certificates().root_to_leaf ();
void
Config::changed ()
{
- write ();
Changed ();
}
{
/* Remove existing instances of this path in the history */
_history.erase (remove (_history.begin(), _history.end(), p), _history.end ());
-
+
_history.insert (_history.begin (), p);
if (_history.size() > HISTORY_SIZE) {
_history.pop_back ();
projects / dcpomatic.git / blobdiff