X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fconfig.cc;h=6f7c8ec556c369a21b5d47b96190a85902789530;hp=5dbbd692e60b50fcdbdf77043fd375a7a393b227;hb=ada96204dfa1456da77e2ea7469f492cfc0a5483;hpb=6543cce6266e2f8389cf1c3987252caf9e254a5a

diff --git a/src/lib/config.cc b/src/lib/config.cc
index 5dbbd692e..6f7c8ec55 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -110,7 +110,8 @@ Config::set_defaults ()
 	_cinemas_file = path ("cinemas.xml");
 	_show_hints_before_make_dcp = true;
 	_kdm_filename_format = dcp::NameFormat ("KDM %f %c %s");
-	_dcp_filename_format = dcp::NameFormat ("%t_%i");
+	_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);
@@ -294,7 +295,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_filename_format = dcp::NameFormat (f.optional_string_child("DCPFilenameFormat").get_value_or ("%t_%i.mxf"));
+	_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)) {
@@ -453,7 +455,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("DCPFilenameFormat")->add_child_text (_dcp_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 ());