X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fexport_filename.cc;h=511db44a6b3f2ca562f585e121d73f26387749fa;hb=9b2612f68615d1b3f80fce732e4a13f5e50ee87d;hp=f7fe22c3b48c5a37b72435f55f2f6ad5305033bf;hpb=5792674ca4d02e093b4318d31a117a47ae72ecdf;p=ardour.git diff --git a/libs/ardour/export_filename.cc b/libs/ardour/export_filename.cc index f7fe22c3b4..511db44a6b 100644 --- a/libs/ardour/export_filename.cc +++ b/libs/ardour/export_filename.cc @@ -24,8 +24,9 @@ #include #include "pbd/xml++.h" -#include "pbd/convert.h" +#include "pbd/string_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; @@ -48,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), @@ -56,17 +58,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); } } @@ -78,18 +87,20 @@ 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 * 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->set_property ("revision", revision); + session.add_extra_xml (*extra_node); return *node; } @@ -98,7 +109,6 @@ int ExportFilename::set_state (const XMLNode & node) { XMLNode * child; - XMLProperty * prop; FieldPair pair; child = node.child ("Folder"); @@ -106,23 +116,22 @@ 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 { folder = tmp; } } - - if (folder.empty()) { + + if (folder.empty() || !Glib::file_test (folder, FileTest (FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR))) { folder = session.session_directory().export_path(); } @@ -133,6 +142,12 @@ 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; + pair = get_field (node, "revision"); include_revision = pair.first; @@ -144,9 +159,14 @@ 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"))) { - revision = atoi (prop->value()); + 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) { + extra_node->get_property ("revision", revision); } return 0; @@ -157,10 +177,25 @@ 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) { + with_timespan = true; + } 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; } @@ -173,11 +208,11 @@ 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; } - if (include_timespan && timespan) { + if (with_timespan && timespan) { path += filename_empty ? "" : "_"; path += timespan->name(); filename_empty = false; @@ -192,7 +227,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; } @@ -214,6 +249,10 @@ ExportFilename::get_path (ExportFormatSpecPtr format) const filename_empty = false; } + if (path.empty ()) { + path = "export"; + } + path += "."; path += format->extension (); @@ -307,7 +346,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; @@ -323,10 +362,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); } } @@ -339,20 +378,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 * 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; }