*/
#include <string>
-#include "ardour/export_filename.h"
#include <glibmm/miscutils.h>
#include <glibmm/fileutils.h>
#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"
#include "ardour/session_directory.h"
-#include "ardour/export_timespan.h"
+#include "ardour/export_filename.h"
#include "ardour/export_format_specification.h"
#include "ardour/export_channel_configuration.h"
+#include "ardour/export_timespan.h"
#include "ardour/utils.h"
#include "i18n.h"
include_session (false),
include_revision (false),
include_channel_config (false),
+ include_format_name (false),
include_channel (false),
include_timespan (true), // Include timespan name always
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);
}
}
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;
}
folder = tmp;
}
}
-
+
if (folder.empty()) {
folder = session.session_directory().export_path();
}
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;
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());
}
{
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 ? "" : "_";
filename_empty = false;
}
- if (include_timespan && timespan) {
+ if (with_timespan && timespan) {
path += filename_empty ? "" : "_";
path += timespan->name();
filename_empty = false;
filename_empty = false;
}
+ if (include_format_name) {
+ path += filename_empty ? "" : "_";
+ path += format->name();
+ filename_empty = false;
+ }
+
+ if (path.empty ()) {
+ path = "export";
+ }
+
path += ".";
path += format->extension ();
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;