using std::vector;
using std::ifstream;
using std::string;
-using std::ofstream;
using std::list;
using std::max;
using std::exception;
, _default_container (Ratio::from_id ("185"))
, _default_dcp_content_type (DCPContentType::from_dci_name ("TST"))
, _default_j2k_bandwidth (200000000)
+ , _default_audio_delay (0)
, _kdm_email (
"Dear Projectionist\n\nPlease find attached KDMs for $CPL_NAME.\n\nBest regards,\nDCP-o-matic"
)
_default_dci_metadata = DCIMetadata (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");
void
Config::read_old_metadata ()
{
+ /* XXX: this won't work with non-Latin filenames */
ifstream f (file(true).string().c_str ());
string line;
root->add_child("DefaultStillLength")->add_child_text (lexical_cast<string> (_default_still_length));
root->add_child("DefaultJ2KBandwidth")->add_child_text (lexical_cast<string> (_default_j2k_bandwidth));
+ root->add_child("DefaultAudioDelay")->add_child_text (lexical_cast<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"));
boost::filesystem::path
Config::default_directory_or (boost::filesystem::path a) const
{
- if (_default_directory.empty() || !boost::filesystem::exists (_default_directory)) {
+ if (_default_directory.empty()) {
+ return a;
+ }
+
+ boost::system::error_code ec;
+ bool const e = boost::filesystem::exists (_default_directory, ec);
+ if (ec || !e) {
return a;
}