#include "filter.h"
#include "ratio.h"
#include "types.h"
+#include "log.h"
#include "dcp_content_type.h"
#include "cinema_sound_processor.h"
#include "colour_conversion.h"
#include <dcp/certificate_chain.h>
#include <libcxml/cxml.h>
#include <glib.h>
+#include <libxml++/libxml++.h>
#include <boost/filesystem.hpp>
#include <boost/algorithm/string.hpp>
#include <boost/foreach.hpp>
#include <cstdlib>
#include <fstream>
+#include <iostream>
#include "i18n.h"
_server_port_base = 6192;
_use_any_servers = true;
_servers.clear ();
+ _only_servers_encode = false;
_tms_protocol = PROTOCOL_SCP;
_tms_ip = "";
_tms_path = ".";
_check_for_test_updates = false;
_maximum_j2k_bandwidth = 250000000;
_log_types = Log::TYPE_GENERAL | Log::TYPE_WARNING | Log::TYPE_ERROR;
+ _automatic_audio_analysis = false;
#ifdef DCPOMATIC_WINDOWS
_win32_console = false;
#endif
}
}
+ _only_servers_encode = f.optional_bool_child ("OnlyServersEncode").get_value_or (false);
_tms_protocol = static_cast<Protocol> (f.optional_number_child<int> ("TMSProtocol").get_value_or (static_cast<int> (PROTOCOL_SCP)));
_tms_ip = f.string_child ("TMSIP");
_tms_path = f.string_child ("TMSPath");
_dcp_issuer = f.string_child ("DCPIssuer");
}
+ _dcp_creator = f.optional_string_child ("DCPCreator").get_value_or ("");
+
if (version && version.get() >= 2) {
_default_isdcf_metadata = ISDCFMetadata (f.node_child ("ISDCFMetadata"));
} else {
_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);
+ _automatic_audio_analysis = f.optional_bool_child ("AutomaticAudioAnalysis").get_value_or (false);
#ifdef DCPOMATIC_WINDOWS
_win32_console = f.optional_bool_child ("Win32Console").get_value_or (false);
#endif
BOOST_FOREACH (cxml::NodePtr i, decryption->node_children ("Certificate")) {
c->add (dcp::Certificate (i->content ()));
}
- c->set_key (signer->string_child ("PrivateKey"));
+ c->set_key (decryption->string_child ("PrivateKey"));
_decryption_chain = c;
} else {
_decryption_chain.reset (new dcp::CertificateChain (openssl_path ()));
/** @return Filename to write configuration to */
boost::filesystem::path
-Config::file ()
+Config::file (bool create_directories)
{
boost::filesystem::path p;
#ifdef DCPOMATIC_OSX
p /= "dcpomatic2";
#endif
boost::system::error_code ec;
- boost::filesystem::create_directories (p, ec);
+ if (create_directories) {
+ boost::filesystem::create_directories (p, ec);
+ }
p /= "config.xml";
return p;
}
/* configuration load failed; never mind, just
stick with the default.
*/
- cerr << "dcpomatic: failed to load configuration (" << e.what() << ")\n";
+ cerr << "dcpomatic: warning: configuration did not load (" << e.what() << "); using defaults\n";
} catch (...) {
- cerr << "dcpomatic: failed to load configuration\n";
+ cerr << "dcpomatic: warning: configuration did not load; using defaults\n";
}
}
root->add_child("Server")->add_child_text (*i);
}
+ root->add_child("OnlyServersEncode")->add_child_text (_only_servers_encode ? "1" : "0");
root->add_child("TMSProtocol")->add_child_text (raw_convert<string> (_tms_protocol));
root->add_child("TMSIP")->add_child_text (_tms_ip);
root->add_child("TMSPath")->add_child_text (_tms_path);
root->add_child("DefaultDCPContentType")->add_child_text (_default_dcp_content_type->isdcf_name ());
}
root->add_child("DCPIssuer")->add_child_text (_dcp_issuer);
+ root->add_child("DCPCreator")->add_child_text (_dcp_creator);
_default_isdcf_metadata.as_xml (root->add_child ("ISDCFMetadata"));
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));
+ root->add_child("AutomaticAudioAnalysis")->add_child_text (_automatic_audio_analysis ? "1" : "0");
#ifdef DCPOMATIC_WINDOWS
root->add_child("Win32Console")->add_child_text (_win32_console ? "1" : "0");
#endif
bool
Config::have_existing ()
{
- return boost::filesystem::exists (file ());
+ return boost::filesystem::exists (file (false));
}