From 7099f0ec4e1fe3909cc829dae72897d7ee836326 Mon Sep 17 00:00:00 2001 From: nick_m Date: Thu, 14 Aug 2014 03:19:40 +1000 Subject: [PATCH] Add backwards compatibility for instant.xml changes. --- libs/ardour/export_filename.cc | 10 ++++++++++ libs/ardour/export_profile_manager.cc | 5 +++++ 2 files changed, 15 insertions(+) diff --git a/libs/ardour/export_filename.cc b/libs/ardour/export_filename.cc index aac96f3ffd..9a05afa5ba 100644 --- 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 b9bc168864..c2d6cb087a 100644 --- 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 {