X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fexport_filename.cc;h=3e0e3f62bf7d6181aa168d05e9d5655a01a82b96;hb=508f23c4d04da082a0e8799eb25e969468d0be4c;hp=177d515028b013a9ad6d778e7a9a69b495acde9c;hpb=cf52d6e4b40111eb04b244ec054055a4ec15dbe0;p=ardour.git

diff --git a/libs/ardour/export_filename.cc b/libs/ardour/export_filename.cc
index 177d515028..3e0e3f62bf 100644
--- a/libs/ardour/export_filename.cc
+++ b/libs/ardour/export_filename.cc
@@ -24,7 +24,7 @@
 #include <glibmm/fileutils.h>
 
 #include "pbd/xml++.h"
-#include "pbd/convert.h"
+#include "pbd/string_convert.h"
 #include "pbd/enumwriter.h"
 #include "pbd/localtime_r.h"
 
@@ -49,6 +49,7 @@ namespace ARDOUR
 ExportFilename::ExportFilename (Session & session) :
   include_label (false),
   include_session (false),
+  use_session_snapshot_name (false),
   include_revision (false),
   include_channel_config (false),
   include_format_name (false),
@@ -86,18 +87,19 @@ ExportFilename::get_state ()
 
 	FieldPair dir = analyse_folder();
 	child = node->add_child ("Folder");
-	child->add_property ("relative", dir.first ? "true" : "false");
-	child->add_property ("path", dir.second);
+	child->set_property ("relative", dir.first);
+	child->set_property ("path", dir.second);
 
 	add_field (node, "label", include_label, label);
 	add_field (node, "session", include_session);
+	add_field (node, "snapshot", use_session_snapshot_name);
 	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 * extra_node = new XMLNode ("ExportRevision");
-	extra_node->add_property ("revision", to_string (revision, std::dec));
+	extra_node->set_property ("revision", revision);
 	session.add_extra_xml (*extra_node);
 
 	return *node;
@@ -107,7 +109,6 @@ int
 ExportFilename::set_state (const XMLNode & node)
 {
 	XMLNode * child;
-	XMLProperty const * prop;
 	FieldPair pair;
 
 	child = node.child ("Folder");
@@ -115,15 +116,14 @@ ExportFilename::set_state (const XMLNode & node)
 
 	folder = "";
 
-	if ((prop = child->property ("relative"))) {
-		if (string_is_affirmative (prop->value())) {
-			folder = session.session_directory().root_path();
-		}
+	bool is_relative;
+	if (child->get_property ("relative", is_relative) && is_relative) {
+		folder = session.session_directory ().root_path ();
 	}
 
-	if ((prop = child->property ("path"))) {
-		std::string tmp;
-		tmp = Glib::build_filename (folder, prop->value());
+	std::string tmp;
+	if (child->get_property ("path", tmp)) {
+		tmp = Glib::build_filename (folder, tmp);
 		if (!Glib::file_test (tmp, Glib::FILE_TEST_EXISTS)) {
 			warning << string_compose (_("Existing export folder for this session (%1) does not exist - ignored"), tmp) << endmsg;
 		} else {
@@ -142,6 +142,9 @@ ExportFilename::set_state (const XMLNode & node)
 	pair = get_field (node, "session");
 	include_session = pair.first;
 
+	pair = get_field (node, "snapshot");
+	use_session_snapshot_name = pair.first;
+
 	pair = get_field (node, "timespan");
 	include_timespan = pair.first;
 
@@ -162,8 +165,8 @@ ExportFilename::set_state (const XMLNode & node)
 		extra_node = session.instant_xml ("ExportRevision");
 	}
 
-	if (extra_node && (prop = extra_node->property ("revision"))) {
-		revision = atoi (prop->value());
+	if (extra_node) {
+		extra_node->get_property ("revision", revision);
 	}
 
 	return 0;
@@ -189,7 +192,11 @@ ExportFilename::get_path (ExportFormatSpecPtr format) const
 
 	if (include_session) {
 		path += filename_empty ? "" : "_";
-		path += session.name();
+		if (use_session_snapshot_name) {
+			path += session.snap_name();
+		} else {
+			path += session.name();
+		}
 		filename_empty = false;
 	}
 
@@ -202,7 +209,7 @@ ExportFilename::get_path (ExportFormatSpecPtr format) const
 	if (include_revision) {
 		path += filename_empty ? "" : "_";
 		path += "r";
-		path += to_string (revision, std::dec);
+		path += to_string (revision);
 		filename_empty = false;
 	}
 
@@ -221,7 +228,7 @@ ExportFilename::get_path (ExportFormatSpecPtr format) const
 	if (include_channel) {
 		path += filename_empty ? "" : "_";
 		path += "channel";
-		path += to_string (channel, std::dec);
+		path += to_string (channel);
 		filename_empty = false;
 	}
 
@@ -356,10 +363,10 @@ ExportFilename::add_field (XMLNode * node, string const & name, bool enabled, st
 		return;
 	}
 
-	child->add_property ("name", name);
-	child->add_property ("enabled", enabled ? "true" : "false");
+	child->set_property ("name", name);
+	child->set_property ("enabled", enabled);
 	if (!value.empty()) {
-		child->add_property ("value", value);
+		child->set_property ("value", value);
 	}
 }
 
@@ -372,20 +379,11 @@ ExportFilename::get_field (XMLNode const & node, string const & name)
 	XMLNodeList children = node.children();
 
 	for (XMLNodeList::iterator it = children.begin(); it != children.end(); ++it) {
-		XMLProperty const * prop = (*it)->property ("name");
-		if (prop && !prop->value().compare (name)) {
-
-			prop = (*it)->property ("enabled");
-			if (prop && !prop->value().compare ("true")) {
-				pair.first = true;
-			} else {
-				pair.first = false;
-			}
-
-			prop = (*it)->property ("value");
-			if (prop) {
-				pair.second = prop->value();
-			}
+		std::string str;
+		if ((*it)->get_property ("name", str) && name == str) {
+
+			(*it)->get_property ("enabled", pair.first);
+			(*it)->get_property ("value", pair.second);
 
 			return pair;
 		}