Move ExportProfile xml from Session instant.xml to session file.

diff --git a/libs/ardour/export_filename.cc b/libs/ardour/export_filename.cc
index f7fe22c3b48c5a37b72435f55f2f6ad5305033bf..aac96f3ffd62bc0fae1983688cdcee962144a299 100644 (file)
--- a/libs/ardour/export_filename.cc
+++ b/libs/ardour/export_filename.cc
@@ -64,9 +64,9 @@ ExportFilename::ExportFilename (Session & session) :
 
        folder = session.session_directory().export_path();
 
-       XMLNode * instant_node = session.instant_xml ("ExportFilename");
-       if (instant_node) {
-               set_state (*instant_node);
+       XMLNode * extra_node = session.extra_xml ("ExportFilename");
+       if (extra_node) {
+               set_state (*extra_node);
        }
 }
 
@@ -87,9 +87,9 @@ ExportFilename::get_state ()
        add_field (node, "time", include_time, enum_2_string (time_format));
        add_field (node, "date", include_date, enum_2_string (date_format));
 
-       XMLNode * instant_node = new XMLNode ("ExportRevision");
-       instant_node->add_property ("revision", to_string (revision, std::dec));
-       session.add_instant_xml (*instant_node);
+       XMLNode * extra_node = new XMLNode ("ExportRevision");
+       extra_node->add_property ("revision", to_string (revision, std::dec));
+       session.add_extra_xml (*extra_node);
 
        return *node;
 }
@@ -144,8 +144,8 @@ ExportFilename::set_state (const XMLNode & node)
        include_date = pair.first;
        date_format = (DateFormat) string_2_enum (pair.second, date_format);
 
-       XMLNode * instant_node = session.instant_xml ("ExportRevision");
-       if (instant_node && (prop = instant_node->property ("revision"))) {
+       XMLNode * extra_node = session.extra_xml ("ExportRevision");
+       if (extra_node && (prop = extra_node->property ("revision"))) {
                revision = atoi (prop->value());
        }
 

diff --git a/libs/ardour/export_profile_manager.cc b/libs/ardour/export_profile_manager.cc
index 4a10d3dfa832b035e220d171f164f4ff1ae0b0f6..b9bc16886457edf5e1d23a21ace2311178796365 100644 (file)
--- a/libs/ardour/export_profile_manager.cc
+++ b/libs/ardour/export_profile_manager.cc
@@ -114,17 +114,17 @@ ExportProfileManager::ExportProfileManager (Session & s, ExportType type)
 
 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);
+       if (extra_node) {
+               set_state (*extra_node);
        } else {
                XMLNode empty_node (xml_node_name);
                set_state (empty_node);