Add backwards compatibility for instant.xml changes.

diff --git a/libs/ardour/export_filename.cc b/libs/ardour/export_filename.cc
index aac96f3ffd62bc0fae1983688cdcee962144a299..9a05afa5ba8448e5718e585181848c3a21e21a3a 100644 (file)
--- a/libs/ardour/export_filename.cc
+++ b/libs/ardour/export_filename.cc
@@ -65,6 +65,11 @@ ExportFilename::ExportFilename (Session & session) :
        folder = session.session_directory().export_path();
 
        XMLNode * extra_node = session.extra_xml ("ExportFilename");
+       /* Legacy sessions used Session instant.xml for this */
+       if (!extra_node) {
+               session.instant_xml ("ExportFilename");
+       }
+
        if (extra_node) {
                set_state (*extra_node);
        }
@@ -145,6 +150,11 @@ ExportFilename::set_state (const XMLNode & node)
        date_format = (DateFormat) string_2_enum (pair.second, date_format);
 
        XMLNode * extra_node = session.extra_xml ("ExportRevision");
+       /* Legacy sessions used Session instant.xml for this */
+       if (!extra_node) {
+               extra_node = session.instant_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 b9bc16886457edf5e1d23a21ace2311178796365..c2d6cb087a6a36ced0e2bb0719031ef7a03fc0e9 100644 (file)
--- a/libs/ardour/export_profile_manager.cc
+++ b/libs/ardour/export_profile_manager.cc
@@ -123,6 +123,11 @@ void
 ExportProfileManager::load_profile ()
 {
        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 {