X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fexport_profile_manager.cc;h=4a10d3dfa832b035e220d171f164f4ff1ae0b0f6;hb=bae86a2d908122d0bb54afcce82d2cf232268a8a;hp=42e494c0cb3c9e1d56f289085149c3d7cae0f678;hpb=2b80aee20a01f70afe9997fd39c4ca8d19c8caf8;p=ardour.git

diff --git a/libs/ardour/export_profile_manager.cc b/libs/ardour/export_profile_manager.cc
index 42e494c0cb..4a10d3dfa8 100644
--- a/libs/ardour/export_profile_manager.cc
+++ b/libs/ardour/export_profile_manager.cc
@@ -34,7 +34,7 @@
 
 #include "ardour/export_profile_manager.h"
 #include "ardour/export_format_specification.h"
-#include "ardour/export_formats_search_path.h"
+#include "ardour/search_paths.h"
 #include "ardour/export_timespan.h"
 #include "ardour/export_channel_configuration.h"
 #include "ardour/export_filename.h"
@@ -332,8 +332,7 @@ ExportProfileManager::find_file (std::string const & pattern)
 {
 	vector<std::string> found;
 
-	Glib::PatternSpec pattern_spec (pattern);
-	find_matching_files_in_search_path (search_path, pattern_spec, found);
+	find_files_matching_pattern (found, search_path, pattern);
 
 	return found;
 }
@@ -644,6 +643,7 @@ ExportProfileManager::get_new_format (ExportFormatSpecPtr original)
 	ExportFormatSpecPtr format;
 	if (original) {
 		format.reset (new ExportFormatSpecification (*original));
+		std::cerr << "After new format created from original, format has id [" << format->id().to_s() << ']' << std::endl;
 	} else {
 		format = handler->add_format();
 		format->set_name (_("empty format"));
@@ -685,7 +685,7 @@ ExportProfileManager::FormatStatePtr
 ExportProfileManager::deserialize_format (XMLNode & root)
 {
 	XMLProperty * prop;
-	UUID id;
+	PBD::UUID id;
 
 	if ((prop = root.property ("id"))) {
 		id = prop->value();
@@ -724,8 +724,20 @@ ExportProfileManager::load_formats ()
 void
 ExportProfileManager::load_format_from_disk (std::string const & path)
 {
-	XMLTree const tree (path);
-	ExportFormatSpecPtr format = handler->add_format (*tree.root());
+	XMLTree tree;
+
+	if (!tree.read (path)) {
+		error << string_compose (_("Cannot load export format from %1"), path) << endmsg;
+		return;
+	}
+
+	XMLNode* root = tree.root();
+	if (!root) {
+		error << string_compose (_("Cannot export format read from %1"), path) << endmsg;
+		return;
+	}
+
+	ExportFormatSpecPtr format = handler->add_format (*root);
 
 	/* Handle id to filename mapping and don't add duplicates to list */