#include "dcp_content_type.h"
#include "sound_processor.h"
#include "colour_conversion.h"
+#include "cinema.h"
+#include "util.h"
#include "i18n.h"
using std::ofstream;
using std::list;
using std::max;
+using std::exception;
+using std::cerr;
using boost::shared_ptr;
using boost::lexical_cast;
using boost::optional;
Config::Config ()
: _num_local_encoding_threads (max (2U, boost::thread::hardware_concurrency()))
, _server_port (6192)
- , _tms_path (N_("."))
+ , _tms_path (".")
, _sound_processor (SoundProcessor::from_id (N_("dolby_cp750")))
, _default_still_length (10)
, _default_container (Ratio::from_id ("185"))
, _default_dcp_content_type (DCPContentType::from_dci_name ("TST"))
, _default_j2k_bandwidth (200000000)
+ , _kdm_email (
+ "Dear Projectionist\n\nPlease find attached KDMs for $CPL_NAME.\n\nBest regards,\nDCP-o-matic"
+ )
{
_allowed_dcp_frame_rates.push_back (24);
_allowed_dcp_frame_rates.push_back (25);
_colour_conversions.push_back (PresetColourConversion (_("sRGB"), 2.4, true, libdcp::colour_matrix::srgb_to_xyz, 2.6));
_colour_conversions.push_back (PresetColourConversion (_("sRGB non-linearised"), 2.4, false, libdcp::colour_matrix::srgb_to_xyz, 2.6));
+ _colour_conversions.push_back (PresetColourConversion (_("Rec. 709"), 2.2, false, libdcp::colour_matrix::rec709_to_xyz, 2.6));
}
void
Config::read ()
{
+ LocaleGuard lg;
+
if (!boost::filesystem::exists (file (false))) {
read_old_metadata ();
return;
f.read_file (file (false));
optional<string> c;
+ optional<int> version = f.optional_number_child<int> ("Version");
+
_num_local_encoding_threads = f.number_child<int> ("NumLocalEncodingThreads");
_default_directory = f.string_child ("DefaultDirectory");
_server_port = f.number_child<int> ("ServerPort");
for (list<shared_ptr<cxml::Node> >::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, libdcp::colour_matrix::rec709_to_xyz, 2.6));
+ }
+
+ list<shared_ptr<cxml::Node> > cin = f.node_children ("Cinema");
+ for (list<shared_ptr<cxml::Node> >::iterator i = cin.begin(); i != cin.end(); ++i) {
+ /* Slightly grotty two-part construction of Cinema here so that we can use
+ shared_from_this.
+ */
+ shared_ptr<Cinema> cinema (new Cinema (*i));
+ cinema->read_screens (*i);
+ _cinemas.push_back (cinema);
+ }
+
+ _mail_server = f.string_child ("MailServer");
+ _kdm_from = f.string_child ("KDMFrom");
+ _kdm_email = f.string_child ("KDMEmail");
}
void
Config::read_old_metadata ()
{
- ifstream f (file(true).c_str ());
+ ifstream f (file(true).string().c_str ());
string line;
+
while (getline (f, line)) {
if (line.empty ()) {
continue;
}
/** @return Filename to write configuration to */
-string
+boost::filesystem::path
Config::file (bool old) const
{
boost::filesystem::path p;
if (old) {
p /= ".dvdomatic";
} else {
- p /= "dcpomatic.xml";
+ p /= "dcpomatic";
+ boost::filesystem::create_directory (p, ec);
+ p /= "config.xml";
}
- return p.string ();
+ return p;
+}
+
+boost::filesystem::path
+Config::signer_chain_directory () const
+{
+ boost::filesystem::path p;
+ p /= g_get_user_config_dir ();
+ p /= "dcpomatic";
+ p /= "crypt";
+ boost::filesystem::create_directories (p);
+ return p;
}
/** @return Singleton instance */
_instance = new Config;
try {
_instance->read ();
- } catch (...) {
+ } catch (exception& e) {
/* configuration load failed; never mind, just
stick with the default.
*/
+ cerr << "dcpomatic: failed to load configuration (" << e.what() << ")\n";
+ } catch (...) {
+ cerr << "dcpomatic: failed to load configuration\n";
}
}
void
Config::write () const
{
+ LocaleGuard lg;
+
xmlpp::Document doc;
xmlpp::Element* root = doc.create_root_node ("Config");
+ root->add_child("Version")->add_child_text ("1");
root->add_child("NumLocalEncodingThreads")->add_child_text (lexical_cast<string> (_num_local_encoding_threads));
- root->add_child("DefaultDirectory")->add_child_text (_default_directory);
+ root->add_child("DefaultDirectory")->add_child_text (_default_directory.string ());
root->add_child("ServerPort")->add_child_text (lexical_cast<string> (_server_port));
for (vector<ServerDescription>::const_iterator i = _servers.begin(); i != _servers.end(); ++i) {
i->as_xml (root->add_child ("ColourConversion"));
}
- doc.write_to_file_formatted (file (false));
+ for (list<shared_ptr<Cinema> >::const_iterator i = _cinemas.begin(); i != _cinemas.end(); ++i) {
+ (*i)->as_xml (root->add_child ("Cinema"));
+ }
+
+ root->add_child("MailServer")->add_child_text (_mail_server);
+ root->add_child("KDMFrom")->add_child_text (_kdm_from);
+ root->add_child("KDMEmail")->add_child_text (_kdm_email);
+
+ std::cout << "dcpomatic: writing configuration to " << file(false).string() << "\n";
+ doc.write_to_file_formatted (file(false).string ());
+ std::cout << "dcpomatic: wrote configuration to " << file(false).string() << "\n";
}
-string
-Config::default_directory_or (string a) const
+boost::filesystem::path
+Config::default_directory_or (boost::filesystem::path a) const
{
if (_default_directory.empty() || !boost::filesystem::exists (_default_directory)) {
return a;