}
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;
{
if (graph_builder->process_normalize ()) {
finish_timespan ();
- export_status->normalizing = false;
+ export_status->active_job = ExportStatus::Exporting;
} else {
- export_status->normalizing = true;
+ export_status->active_job = ExportStatus::Normalizing;
}
export_status->current_normalize_cycle++;
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(),
*/
- graph_builder->reset ();
+ export_status->active_job = ExportStatus::Tagging;
AudiofileTagger::tag_file(filename, *SessionMetadata::Metadata());
}
...
};
#endif
-
+ 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> ('n', session.name ()));
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);
}
CDMarkerStatus status (filepath, timespan, file_format, filename);
- if (!status.out) {
- error << string_compose(_("Editor: cannot open \"%1\" as export file for CD marker file"), filepath) << endmsg;
- return;
- }
-
(this->*header_func) (status);
/* Get locations and sort */
}
} 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());
}
}