ardour/livetrax
13
0
Fork 0
Code

Prepare for optional timespan name during export.

Browse Source
This commit is contained in:
Robin Gareus 2016-02-11 20:51:19 +01:00
parent e6b06597b7
commit 2c2002ee9c
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libs/ardour/export_filename.cc
View File

@ -169,6 +169,18 @@ ExportFilename::get_path (ExportFormatSpecPtr format) const
{ {
string path; string path;
bool filename_empty = true; 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) { if (include_session) {
path += filename_empty ? "" : "_"; path += filename_empty ? "" : "_";
@ -189,7 +201,7 @@ ExportFilename::get_path (ExportFormatSpecPtr format) const
filename_empty = false; filename_empty = false;
} }
if (include_timespan && timespan) { if (with_timespan && timespan) {
path += filename_empty ? "" : "_"; path += filename_empty ? "" : "_";
path += timespan->name(); path += timespan->name();
filename_empty = false; filename_empty = false;
@ -226,6 +238,10 @@ ExportFilename::get_path (ExportFormatSpecPtr format) const
filename_empty = false; filename_empty = false;
} }
if (path.empty ()) {
path = "export";
}
path += "."; path += ".";
path += format->extension (); path += format->extension ();

8
libs/ardour/export_handler.cc
View File

@ -148,6 +148,14 @@ ExportHandler::do_export ()
} }
export_status->total_timespans = timespan_set.size(); export_status->total_timespans = timespan_set.size();
if (export_status->total_timespans > 1) {
// always include timespan if there's more than one.
for (ConfigMap::iterator it = config_map.begin(); it != config_map.end(); ++it) {
FileSpec & spec = it->second;
spec.filename->include_timespan = true;
}
}
/* Start export */ /* Start export */
Glib::Threads::Mutex::Lock l (export_status->lock()); Glib::Threads::Mutex::Lock l (export_status->lock());