#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"
ExportProfileManager::~ExportProfileManager ()
{
- XMLNode * instant_xml (new XMLNode (xml_node_name));
- serialize_profile (*instant_xml);
- session.add_instant_xml (*instant_xml, false);
+ XMLNode * extra_xml (new XMLNode (xml_node_name));
+ serialize_profile (*extra_xml);
+ session.add_extra_xml (*extra_xml);
}
void
ExportProfileManager::load_profile ()
{
- XMLNode * instant_node = session.instant_xml (xml_node_name);
- if (instant_node) {
- set_state (*instant_node);
+ XMLNode * extra_node = session.extra_xml (xml_node_name);
+ /* Legacy sessions used Session instant.xml for this */
+ if (!extra_node) {
+ extra_node = session.instant_xml (xml_node_name);
+ }
+
+ if (extra_node) {
+ set_state (*extra_node);
} else {
XMLNode empty_node (xml_node_name);
set_state (empty_node);
{
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;
}
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"));
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 */