X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fexport_handler.cc;h=5e3509167da50aee9ea27c8b8a3e4a0861d79ee0;hb=008eda2858efab4da5a0dc90c29977d56aa7eff2;hp=37e5f11455b42076faee5835c6c56ad6fe53b518;hpb=ae8c494c026a6ce221d5f2cd28fc2df9d44e0893;p=ardour.git diff --git a/libs/ardour/export_handler.cc b/libs/ardour/export_handler.cc index 37e5f11455..5e3509167d 100644 --- a/libs/ardour/export_handler.cc +++ b/libs/ardour/export_handler.cc @@ -20,7 +20,7 @@ #include "ardour/export_handler.h" -#include +#include "pbd/gstdio_compat.h" #include #include @@ -118,7 +118,7 @@ ExportHandler::ExportHandler (Session & session) ExportHandler::~ExportHandler () { - graph_builder->cleanup (export_status->aborted () ); + graph_builder->cleanup (export_status->aborted () ); } /** Add an export to the `to-do' list */ @@ -148,8 +148,17 @@ ExportHandler::do_export () } 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 (); } @@ -160,7 +169,7 @@ ExportHandler::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; } @@ -168,7 +177,7 @@ ExportHandler::start_timespan () this is the timespan to do this time */ current_timespan = config_map.begin()->first; - + export_status->total_frames_current_timespan = current_timespan->get_length(); export_status->timespan_name = current_timespan->name(); export_status->processed_frames_current_timespan = 0; @@ -219,11 +228,13 @@ ExportHandler::handle_duplicate_format_extensions() 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); } } @@ -231,6 +242,7 @@ ExportHandler::process (framecnt_t frames) int ExportHandler::process_timespan (framecnt_t frames) { + export_status->active_job = ExportStatus::Exporting; /* update position */ framecnt_t frames_to_read = 0; @@ -272,9 +284,9 @@ ExportHandler::process_normalize () { 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++; @@ -292,11 +304,12 @@ ExportHandler::command_output(std::string output, size_t size) 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); } @@ -309,7 +322,19 @@ ExportHandler::finish_timespan () 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()) { + /* TODO: check Umlauts and encoding in filename. + * TagLib eventually calls CreateFileA(), + */ + export_status->active_job = ExportStatus::Tagging; AudiofileTagger::tag_file(filename, *SessionMetadata::Metadata()); } @@ -323,7 +348,7 @@ ExportHandler::finish_timespan () ... }; #endif - + export_status->active_job = ExportStatus::Command; PBD::ScopedConnection command_connection; std::map subs; subs.insert (std::pair ('f', filename)); @@ -333,15 +358,17 @@ ExportHandler::finish_timespan () subs.insert (std::pair ('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); } @@ -418,11 +445,6 @@ ExportHandler::export_cd_marker_file (ExportTimespanPtr timespan, ExportFormatSp 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 */ @@ -498,10 +520,10 @@ ExportHandler::export_cd_marker_file (ExportTimespanPtr timespan, ExportFormatSp } } 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()); } } @@ -557,8 +579,8 @@ ExportHandler::write_cue_header (CDMarkerStatus & status) BINARY = "header-less" audio (44.1 kHz, 16 Bit, little endian), MOTOROLA = "header-less" audio (44.1 kHz, 16 Bit, big endian), and MP3 - - We try to use these file types whenever appropriate and + + We try to use these file types whenever appropriate and default to our own names otherwise. */ status.out << "FILE \"" << Glib::path_get_basename(status.filename) << "\" "; @@ -681,14 +703,14 @@ ExportHandler::write_track_info_toc (CDMarkerStatus & status) status.out << "CD_TEXT {" << endl << " LANGUAGE 0 {" << endl; status.out << " TITLE " << toc_escape_cdtext (status.marker->name()) << endl; - + status.out << " PERFORMER "; if (status.marker->cd_info.find("performer") != status.marker->cd_info.end()) { status.out << toc_escape_cdtext (status.marker->cd_info["performer"]) << endl; } else { status.out << "\"\"" << endl; } - + if (status.marker->cd_info.find("composer") != status.marker->cd_info.end()) { status.out << " SONGWRITER " << toc_escape_cdtext (status.marker->cd_info["composer"]) << endl; } @@ -809,7 +831,7 @@ ExportHandler::toc_escape_cdtext (const std::string& txt) out += buf; } } - + out += '"'; return out; @@ -834,7 +856,7 @@ ExportHandler::toc_escape_filename (const std::string& txt) out += *c; } } - + out += '"'; return out; @@ -845,15 +867,15 @@ ExportHandler::cue_escape_cdtext (const std::string& txt) { std::string latin1_txt; std::string out; - + try { latin1_txt = Glib::convert (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)); } - + // does not do much mor than UTF-8 to Latin1 translation yet, but - // that may have to change if cue parsers in burning programs change + // that may have to change if cue parsers in burning programs change out = '"' + latin1_txt + '"'; return out;