X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.cc;h=4184a7d1d53aab035368ffef2220156b33bb26f4;hb=b8ab7864ea798d633c4dbfa6be69c58a227d9ca2;hp=5dbbd692e60b50fcdbdf77043fd375a7a393b227;hpb=1d022220899c63e2cae0a2a9a81f6c6db955a23d;p=dcpomatic.git

diff --git a/src/lib/config.cc b/src/lib/config.cc
index 5dbbd692e..4184a7d1d 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -29,7 +29,7 @@
 #include "cinema.h"
 #include "util.h"
 #include "cross.h"
-#include "raw_convert.h"
+#include <dcp/raw_convert.h>
 #include <dcp/name_format.h>
 #include <dcp/colour_matrix.h>
 #include <dcp/certificate_chain.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;
@@ -110,7 +111,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");
+	_dcp_asset_filename_format = dcp::NameFormat ("%t");
 
 	_allowed_dcp_frame_rates.clear ();
 	_allowed_dcp_frame_rates.push_back (24);
@@ -294,7 +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_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"));
+	_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)) {
@@ -377,7 +380,7 @@ Config::write_config_xml () const
 	}
 
 	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("TMSProtocol")->add_child_text (raw_convert<string> (static_cast<int> (_tms_protocol)));
 	root->add_child("TMSIP")->add_child_text (_tms_ip);
 	root->add_child("TMSPath")->add_child_text (_tms_path);
 	root->add_child("TMSUser")->add_child_text (_tms_user);
@@ -453,7 +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("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 ());