From: Carl Hetherington Date: Tue, 16 Aug 2016 21:59:11 +0000 (+0100) Subject: Fix default filename formats. X-Git-Tag: v2.9.13~14 X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;ds=sidebyside;h=5d2e1fbf575670fa5750e2575ac45d2b5cdc9b83;p=dcpomatic.git Fix default filename formats. --- diff --git a/src/lib/config.cc b/src/lib/config.cc index 5df45ea08..4184a7d1d 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -296,8 +296,8 @@ try _cinemas_file = f.optional_string_child("CinemasFile").get_value_or (path ("cinemas.xml").string ()); _show_hints_before_make_dcp = f.optional_bool_child("ShowHintsBeforeMakeDCP").get_value_or (true); _kdm_filename_format = dcp::NameFormat (f.optional_string_child("KDMFilenameFormat").get_value_or ("KDM %f %c %s")); - _dcp_metadata_filename_format = dcp::NameFormat (f.optional_string_child("DCPMetadataFilenameFormat").get_value_or ("%t_%i")); - _dcp_asset_filename_format = dcp::NameFormat (f.optional_string_child("DCPAssetFilenameFormat").get_value_or ("%t_%i")); + _dcp_metadata_filename_format = dcp::NameFormat (f.optional_string_child("DCPMetadataFilenameFormat").get_value_or ("%t")); + _dcp_asset_filename_format = dcp::NameFormat (f.optional_string_child("DCPAssetFilenameFormat").get_value_or ("%t")); /* Replace any cinemas from config.xml with those from the configured file */ if (boost::filesystem::exists (_cinemas_file)) {