X-Git-Url: https://main.carlh.net/gitweb/?p=ardour.git;a=blobdiff_plain;f=libs%2Fardour%2Fexport_filename.cc;h=177d515028b013a9ad6d778e7a9a69b495acde9c;hp=f7fe22c3b48c5a37b72435f55f2f6ad5305033bf;hb=c8c6bca6587450ff64303dbc994a4cd28d6ce7aa;hpb=24d2b5ec9200bf46ccb42528560de4a02b7be516

diff --git a/libs/ardour/export_filename.cc b/libs/ardour/export_filename.cc
index f7fe22c3b4..177d515028 100644
--- a/libs/ardour/export_filename.cc
+++ b/libs/ardour/export_filename.cc
@@ -26,6 +26,7 @@
 #include "pbd/xml++.h"
 #include "pbd/convert.h"
 #include "pbd/enumwriter.h"
+#include "pbd/localtime_r.h"
 
 #include "ardour/libardour_visibility.h"
 #include "ardour/session.h"
@@ -36,7 +37,7 @@
 #include "ardour/export_timespan.h"
 #include "ardour/utils.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace PBD;
 using namespace Glib;
@@ -56,17 +57,24 @@ 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);
-	time_struct = localtime (&rawtime);
+	localtime_r (&rawtime, &time_struct);
 
 	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");
+	/* Legacy sessions used Session instant.xml for this */
+	if (!extra_node) {
+		session.instant_xml ("ExportFilename");
+	}
+
+	if (extra_node) {
+		set_state (*extra_node);
 	}
 }
 
@@ -83,13 +91,14 @@ ExportFilename::get_state ()
 
 	add_field (node, "label", include_label, label);
 	add_field (node, "session", include_session);
+	add_field (node, "timespan", include_timespan);
 	add_field (node, "revision", include_revision);
 	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;
 }
@@ -98,7 +107,7 @@ int
 ExportFilename::set_state (const XMLNode & node)
 {
 	XMLNode * child;
-	XMLProperty * prop;
+	XMLProperty const * prop;
 	FieldPair pair;
 
 	child = node.child ("Folder");
@@ -121,7 +130,7 @@ ExportFilename::set_state (const XMLNode & node)
 			folder = tmp;
 		}
 	}
-	
+
 	if (folder.empty()) {
 		folder = session.session_directory().export_path();
 	}
@@ -133,6 +142,9 @@ ExportFilename::set_state (const XMLNode & node)
 	pair = get_field (node, "session");
 	include_session = pair.first;
 
+	pair = get_field (node, "timespan");
+	include_timespan = pair.first;
+
 	pair = get_field (node, "revision");
 	include_revision = pair.first;
 
@@ -144,8 +156,13 @@ 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");
+	/* 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());
 	}
 
@@ -157,6 +174,18 @@ ExportFilename::get_path (ExportFormatSpecPtr format) const
 {
 	string path;
 	bool filename_empty = true;
+	bool with_timespan = include_timespan;
+
+	if (!include_session
+			&& !include_label
+			&& !include_revision
+			&& !include_timespan
+			&& !include_channel_config
+			&& !include_channel
+			&& !include_date
+			&& !include_format_name) {
+		with_timespan = true;
+	}
 
 	if (include_session) {
 		path += filename_empty ? "" : "_";
@@ -177,7 +206,7 @@ ExportFilename::get_path (ExportFormatSpecPtr format) const
 		filename_empty = false;
 	}
 
-	if (include_timespan && timespan) {
+	if (with_timespan && timespan) {
 		path += filename_empty ? "" : "_";
 		path += timespan->name();
 		filename_empty = false;
@@ -214,6 +243,10 @@ ExportFilename::get_path (ExportFormatSpecPtr format) const
 		filename_empty = false;
 	}
 
+	if (path.empty ()) {
+		path = "export";
+	}
+
 	path += ".";
 	path += format->extension ();
 
@@ -307,7 +340,7 @@ string
 ExportFilename::get_formatted_time (string const & format) const
 {
 	char buffer [80];
-	strftime (buffer, 80, format.c_str(), time_struct);
+	strftime (buffer, 80, format.c_str(), &time_struct);
 
 	string return_value (buffer);
 	return return_value;
@@ -339,7 +372,7 @@ ExportFilename::get_field (XMLNode const & node, string const & name)
 	XMLNodeList children = node.children();
 
 	for (XMLNodeList::iterator it = children.begin(); it != children.end(); ++it) {
-		XMLProperty * prop = (*it)->property ("name");
+		XMLProperty const * prop = (*it)->property ("name");
 		if (prop && !prop->value().compare (name)) {
 
 			prop = (*it)->property ("enabled");