X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fconfig.cc;h=e726acee189498b4b9ef75d6cda1de63c5821e70;hb=53eea12d3e0d7925d5949de92859bc358ee0adcc;hp=d624e607045349c9dc21af0d0b29b65f0f2cbd5b;hpb=f4030653da8f5a0b3daebe640f485b3daf9ef091;p=dcpomatic.git diff --git a/src/lib/config.cc b/src/lib/config.cc index d624e6070..e726acee1 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2014 Carl Hetherington + Copyright (C) 2012-2015 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,19 +17,8 @@ */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include "config.h" #include "server.h" -#include "scaler.h" #include "filter.h" #include "ratio.h" #include "dcp_content_type.h" @@ -38,6 +27,16 @@ #include "cinema.h" #include "util.h" #include "cross.h" +#include "raw_convert.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "i18n.h" @@ -52,31 +51,39 @@ using std::exception; using std::cerr; using boost::shared_ptr; using boost::optional; -using boost::algorithm::is_any_of; -using boost::algorithm::split; -using dcp::raw_convert; +using boost::algorithm::trim; Config* Config::_instance = 0; /** Construct default configuration */ Config::Config () - : _num_local_encoding_threads (max (2U, boost::thread::hardware_concurrency())) - , _server_port_base (6192) - , _use_any_servers (true) - , _tms_path (".") - , _cinema_sound_processor (CinemaSoundProcessor::from_id (N_("dolby_cp750"))) - , _allow_any_dcp_frame_rate (false) - , _default_still_length (10) - , _default_scale (VideoContentScale (Ratio::from_id ("185"))) - , _default_container (Ratio::from_id ("185")) - , _default_dcp_content_type (DCPContentType::from_isdcf_name ("TST")) - , _default_j2k_bandwidth (100000000) - , _default_audio_delay (0) - , _check_for_updates (false) - , _check_for_test_updates (false) - , _maximum_j2k_bandwidth (250000000) - , _log_types (Log::TYPE_GENERAL | Log::TYPE_WARNING | Log::TYPE_ERROR) { + set_defaults (); +} + +void +Config::set_defaults () +{ + _num_local_encoding_threads = max (2U, boost::thread::hardware_concurrency ()); + _server_port_base = 6192; + _use_any_servers = true; + _tms_path = "."; + _cinema_sound_processor = CinemaSoundProcessor::from_id (N_("dolby_cp750")); + _allow_any_dcp_frame_rate = false; + _default_still_length = 10; + _default_container = Ratio::from_id ("185"); + _default_dcp_content_type = DCPContentType::from_isdcf_name ("FTR"); + _default_j2k_bandwidth = 100000000; + _default_audio_delay = 0; + _check_for_updates = false; + _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 + _win32_console = false; +#endif + + _allowed_dcp_frame_rates.clear (); _allowed_dcp_frame_rates.push_back (24); _allowed_dcp_frame_rates.push_back (25); _allowed_dcp_frame_rates.push_back (30); @@ -84,11 +91,14 @@ Config::Config () _allowed_dcp_frame_rates.push_back (50); _allowed_dcp_frame_rates.push_back (60); - _colour_conversions.push_back (PresetColourConversion (_("sRGB"), 2.4, true, dcp::colour_matrix::srgb_to_xyz, 2.6)); - _colour_conversions.push_back (PresetColourConversion (_("sRGB non-linearised"), 2.4, false, dcp::colour_matrix::srgb_to_xyz, 2.6)); - _colour_conversions.push_back (PresetColourConversion (_("Rec. 709"), 2.2, false, dcp::colour_matrix::rec709_to_xyz, 2.6)); + set_kdm_email_to_default (); +} - reset_kdm_email (); +void +Config::restore_defaults () +{ + Config::instance()->set_defaults (); + Config::instance()->changed (); } void @@ -145,11 +155,6 @@ Config::read () _language = f.optional_string_child ("Language"); - c = f.optional_string_child ("DefaultScale"); - if (c) { - _default_scale = VideoContentScale::from_id (c.get ()); - } - c = f.optional_string_child ("DefaultContainer"); if (c) { _default_container = Ratio::from_id (c.get ()); @@ -176,23 +181,6 @@ Config::read () _default_j2k_bandwidth = f.optional_number_child("DefaultJ2KBandwidth").get_value_or (200000000); _default_audio_delay = f.optional_number_child("DefaultAudioDelay").get_value_or (0); - list cc = f.node_children ("ColourConversion"); - - if (!cc.empty ()) { - _colour_conversions.clear (); - } - - for (list::iterator i = cc.begin(); i != cc.end(); ++i) { - _colour_conversions.push_back (PresetColourConversion (*i)); - } - - if (!version) { - /* Loading version 0 (before Rec. 709 was added as a preset). - Add it in. - */ - _colour_conversions.push_back (PresetColourConversion (_("Rec. 709"), 2.2, false, dcp::colour_matrix::rec709_to_xyz, 2.6)); - } - list cin = f.node_children ("Cinema"); for (list::iterator i = cin.begin(); i != cin.end(); ++i) { /* Slightly grotty two-part construction of Cinema here so that we can use @@ -219,6 +207,9 @@ Config::read () _allow_any_dcp_frame_rate = f.optional_bool_child ("AllowAnyDCPFrameRate"); _log_types = f.optional_number_child ("LogTypes").get_value_or (Log::TYPE_GENERAL | Log::TYPE_WARNING | Log::TYPE_ERROR); +#ifdef DCPOMATIC_WINDOWS + _win32_console = f.optional_bool_child ("Win32Console").get_value_or (false); +#endif list his = f.node_children ("History"); for (list::const_iterator i = his.begin(); i != his.end(); ++i) { @@ -268,11 +259,18 @@ boost::filesystem::path 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; } @@ -325,7 +323,6 @@ Config::write () const if (_language) { root->add_child("Language")->add_child_text (_language.get()); } - root->add_child("DefaultScale")->add_child_text (_default_scale.id ()); if (_default_container) { root->add_child("DefaultContainer")->add_child_text (_default_container->id ()); } @@ -340,10 +337,6 @@ Config::write () const root->add_child("DefaultJ2KBandwidth")->add_child_text (raw_convert (_default_j2k_bandwidth)); root->add_child("DefaultAudioDelay")->add_child_text (raw_convert (_default_audio_delay)); - for (vector::const_iterator i = _colour_conversions.begin(); i != _colour_conversions.end(); ++i) { - i->as_xml (root->add_child ("ColourConversion")); - } - for (list >::const_iterator i = _cinemas.begin(); i != _cinemas.end(); ++i) { (*i)->as_xml (root->add_child ("Cinema")); } @@ -363,6 +356,9 @@ Config::write () const root->add_child("MaximumJ2KBandwidth")->add_child_text (raw_convert (_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 (_log_types)); +#ifdef DCPOMATIC_WINDOWS + root->add_child("Win32Console")->add_child_text (_win32_console ? "1" : "0"); +#endif xmlpp::Element* signer = root->add_child ("Signer"); dcp::CertificateChain::List certs = _signer->certificates().root_to_leaf (); @@ -377,8 +373,14 @@ Config::write () const for (vector::const_iterator i = _history.begin(); i != _history.end(); ++i) { root->add_child("History")->add_child_text (i->string ()); } - - doc.write_to_file_formatted (file().string ()); + + try { + doc.write_to_file_formatted (file().string ()); + } catch (xmlpp::exception& e) { + string s = e.what (); + trim (s); + throw FileError (s, file ()); + } } boost::filesystem::path @@ -407,12 +409,11 @@ Config::drop () void Config::changed () { - write (); Changed (); } void -Config::reset_kdm_email () +Config::set_kdm_email_to_default () { _kdm_email = _( "Dear Projectionist\n\n" @@ -424,6 +425,13 @@ Config::reset_kdm_email () ); } +void +Config::reset_kdm_email () +{ + set_kdm_email_to_default (); + changed (); +} + void Config::add_to_history (boost::filesystem::path p) {