properly handle integer steps in plugin controls

[ardour.git] / libs / ardour / export_filename.cc

diff --git a/libs/ardour/export_filename.cc b/libs/ardour/export_filename.cc
index aac96f3ffd62bc0fae1983688cdcee962144a299..945af25dee12b2adcb73e27d5415c4b1539b5181 100644 (file)
--- a/libs/ardour/export_filename.cc
+++ b/libs/ardour/export_filename.cc
@@ -56,7 +56,9 @@ ExportFilename::ExportFilename (Session & session) :
   include_time (false),
   include_date (false),
   session (session),
-  revision (1)
+  revision (1),
+  date_format (D_None),
+  time_format (T_None)
 {
        time_t rawtime;
        std::time (&rawtime);
@@ -65,6 +67,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 +152,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());
        }