X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.cc;h=7f457439d98f0f8a2b1b4c2fcf22b68cc74a8f0c;hb=73654117144c6de0ec4efe39ddc88485df546cc9;hp=a5a42436b24355c9f4e1605b277a49f53fcc700d;hpb=736b3a068ba5a402b541d32f270669e6e1a4e5c4;p=dcpomatic.git

diff --git a/src/lib/config.cc b/src/lib/config.cc
index a5a42436b..7f457439d 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -29,8 +29,8 @@
 #include "cinema.h"
 #include "util.h"
 #include "cross.h"
-#include "raw_convert.h"
-#include "kdm_name_format.h"
+#include <dcp/raw_convert.h>
+#include <dcp/name_format.h>
 #include <dcp/colour_matrix.h>
 #include <dcp/certificate_chain.h>
 #include <libcxml/cxml.h>
@@ -58,6 +58,7 @@ using std::cerr;
 using boost::shared_ptr;
 using boost::optional;
 using boost::algorithm::trim;
+using dcp::raw_convert;
 
 Config* Config::_instance = 0;
 boost::signals2::signal<void ()> Config::FailedToLoad;
@@ -109,7 +110,9 @@ Config::set_defaults ()
 #endif
 	_cinemas_file = path ("cinemas.xml");
 	_show_hints_before_make_dcp = true;
-	_kdm_filename_format = KDMNameFormat ("KDM %f %c %s");
+	_kdm_filename_format = dcp::NameFormat ("KDM %f %c %s");
+	_dcp_metadata_filename_format = dcp::NameFormat ("%t_%i");
+	_dcp_asset_filename_format = dcp::NameFormat ("%t_%i");
 
 	_allowed_dcp_frame_rates.clear ();
 	_allowed_dcp_frame_rates.push_back (24);
@@ -292,7 +295,9 @@ 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 = KDMNameFormat (f.optional_string_child("KDMFilenameFormat").get_value_or ("KDM %f %c %s"));
+	_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"));
 
 	/* Replace any cinemas from config.xml with those from the configured file */
 	if (boost::filesystem::exists (_cinemas_file)) {
@@ -451,6 +456,8 @@ Config::write_config_xml () const
 	root->add_child("CinemasFile")->add_child_text (_cinemas_file.string());
 	root->add_child("ShowHintsBeforeMakeDCP")->add_child_text (_show_hints_before_make_dcp ? "1" : "0");
 	root->add_child("KDMFilenameFormat")->add_child_text (_kdm_filename_format.specification ());
+	root->add_child("DCPMetadataFilenameFormat")->add_child_text (_dcp_metadata_filename_format.specification ());
+	root->add_child("DCPAssetFilenameFormat")->add_child_text (_dcp_asset_filename_format.specification ());
 
 	try {
 		doc.write_to_file_formatted (path("config.xml").string ());