}
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 */
+ Glib::Threads::Mutex::Lock l (export_status->lock());
start_timespan ();
}
if (config_map.empty()) {
// freewheeling has to be stopped from outside the process cycle
- export_status->running = false;
+ export_status->set_running (false);
return;
}
int
ExportHandler::process (framecnt_t frames)
{
- if (!export_status->running) {
+ if (!export_status->running ()) {
return 0;
} else if (normalizing) {
+ Glib::Threads::Mutex::Lock l (export_status->lock());
return process_normalize ();
} else {
+ Glib::Threads::Mutex::Lock l (export_status->lock());
return process_timespan (frames);
}
}
int
ExportHandler::process_timespan (framecnt_t frames)
{
+ export_status->active_job = ExportStatus::Exporting;
/* update position */
framecnt_t frames_to_read = 0;
void
ExportHandler::finish_timespan ()
{
+ graph_builder->get_analysis_results (export_status->result_map);
+
while (config_map.begin() != timespan_bounds.second) {
ExportFormatSpecPtr fmt = config_map.begin()->second.format;
std::string filename = config_map.begin()->second.filename->get_path(fmt);
-
if (fmt->with_cue()) {
export_cd_marker_file (current_timespan, fmt, filename, CDMarkerCUE);
}
export_cd_marker_file (current_timespan, fmt, filename, MP4Chaps);
}
+ Session::Exported (current_timespan->name(), filename); /* EMIT SIGNAL */
+
+ /* close file first, otherwise TagLib enounters an ERROR_SHARING_VIOLATION
+ * The process cannot access the file because it is being used.
+ * ditto for post-export and upload.
+ */
+ graph_builder->reset ();
+
if (fmt->tag()) {
- /* close file first, otherwise TagLib enounters an ERROR_SHARING_VIOLATION
- * The process cannot access the file because it is being used.
- *
- * TODO: check Umlauts and encoding in filename.
+ /* TODO: check Umlauts and encoding in filename.
* TagLib eventually calls CreateFileA(),
*/
export_status->active_job = ExportStatus::Tagging;
- graph_builder->reset ();
AudiofileTagger::tag_file(filename, *SessionMetadata::Metadata());
}
if (!fmt->command().empty()) {
+ SessionMetadata const & metadata (*SessionMetadata::Metadata());
-#if 0 // would be nicer with C++11 initialiser...
+#if 0 // would be nicer with C++11 initialiser...
std::map<char, std::string> subs {
{ 'f', filename },
{ 'd', Glib::path_get_dirname(filename) + G_DIR_SEPARATOR },
export_status->active_job = ExportStatus::Command;
PBD::ScopedConnection command_connection;
std::map<char, std::string> subs;
- subs.insert (std::pair<char, std::string> ('f', filename));
- subs.insert (std::pair<char, std::string> ('d', Glib::path_get_dirname (filename) + G_DIR_SEPARATOR));
+
+ std::stringstream track_number;
+ track_number << metadata.track_number ();
+ std::stringstream total_tracks;
+ total_tracks << metadata.total_tracks ();
+ std::stringstream year;
+ year << metadata.year ();
+
+ subs.insert (std::pair<char, std::string> ('a', metadata.artist ()));
subs.insert (std::pair<char, std::string> ('b', PBD::basename_nosuffix (filename)));
- subs.insert (std::pair<char, std::string> ('s', session.path ()));
+ subs.insert (std::pair<char, std::string> ('c', metadata.copyright ()));
+ subs.insert (std::pair<char, std::string> ('d', Glib::path_get_dirname (filename) + G_DIR_SEPARATOR));
+ subs.insert (std::pair<char, std::string> ('f', filename));
+ subs.insert (std::pair<char, std::string> ('l', metadata.lyricist ()));
subs.insert (std::pair<char, std::string> ('n', session.name ()));
+ subs.insert (std::pair<char, std::string> ('s', session.path ()));
+ subs.insert (std::pair<char, std::string> ('o', metadata.conductor ()));
+ subs.insert (std::pair<char, std::string> ('t', metadata.title ()));
+ subs.insert (std::pair<char, std::string> ('z', metadata.organization ()));
+ subs.insert (std::pair<char, std::string> ('A', metadata.album ()));
+ subs.insert (std::pair<char, std::string> ('C', metadata.comment ()));
+ subs.insert (std::pair<char, std::string> ('E', metadata.engineer ()));
+ subs.insert (std::pair<char, std::string> ('G', metadata.genre ()));
+ subs.insert (std::pair<char, std::string> ('L', total_tracks.str ()));
+ subs.insert (std::pair<char, std::string> ('M', metadata.mixer ()));
+ subs.insert (std::pair<char, std::string> ('N', current_timespan->name())); // =?= config_map.begin()->first->name ()
+ subs.insert (std::pair<char, std::string> ('O', metadata.composer ()));
+ subs.insert (std::pair<char, std::string> ('P', metadata.producer ()));
+ subs.insert (std::pair<char, std::string> ('S', metadata.disc_subtitle ()));
+ subs.insert (std::pair<char, std::string> ('T', track_number.str ()));
+ subs.insert (std::pair<char, std::string> ('Y', year.str ()));
+ subs.insert (std::pair<char, std::string> ('Z', metadata.country ()));
ARDOUR::SystemExec *se = new ARDOUR::SystemExec(fmt->command(), subs);
+ info << "Post-export command line : {" << se->to_s () << "}" << endmsg;
se->ReadStdout.connect_same_thread(command_connection, boost::bind(&ExportHandler::command_output, this, _1, _2));
- if (se->start (2) == 0) {
+ int ret = se->start (2);
+ if (ret == 0) {
// successfully started
while (se->is_running ()) {
// wait for system exec to terminate
Glib::usleep (1000);
}
} else {
- error << "post-export hook failed! " << fmt->command() << endmsg;
+ error << "Post-export command FAILED with Error: " << ret << endmsg;
}
delete (se);
}
}
} catch (std::exception& e) {
- error << string_compose (_("an error occured while writing a TOC/CUE file: %1"), e.what()) << endmsg;
+ error << string_compose (_("an error occurred while writing a TOC/CUE file: %1"), e.what()) << endmsg;
::g_unlink (filepath.c_str());
} catch (Glib::Exception& e) {
- error << string_compose (_("an error occured while writing a TOC/CUE file: %1"), e.what()) << endmsg;
+ error << string_compose (_("an error occurred while writing a TOC/CUE file: %1"), e.what()) << endmsg;
::g_unlink (filepath.c_str());
}
}
char buf[5];
try {
- latin1_txt = Glib::convert (txt, "ISO-8859-1", "UTF-8");
+ latin1_txt = Glib::convert_with_fallback (txt, "ISO-8859-1", "UTF-8", "_");
} catch (Glib::ConvertError& err) {
throw Glib::ConvertError (err.code(), string_compose (_("Cannot convert %1 to Latin-1 text"), txt));
}
projects / ardour.git / blobdiff