X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fexport_handler.cc;h=8ca73788dd24b416d3935571de1177d5e3d56813;hb=cf52d6e4b40111eb04b244ec054055a4ec15dbe0;hp=a9066ee6e71dd193f1cea94c95047b2f5d44e540;hpb=2397429e99d4b79ae874392665db2627674daaa0;p=ardour.git diff --git a/libs/ardour/export_handler.cc b/libs/ardour/export_handler.cc index a9066ee6e7..8ca73788dd 100644 --- a/libs/ardour/export_handler.cc +++ b/libs/ardour/export_handler.cc @@ -40,7 +40,7 @@ #include "pbd/basename.h" #include "ardour/session_metadata.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace PBD; @@ -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; } @@ -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,20 +322,26 @@ 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()) { - /* 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()); } 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 subs { { 'f', filename }, { 'd', Glib::path_get_dirname(filename) + G_DIR_SEPARATOR }, @@ -330,25 +349,54 @@ ExportHandler::finish_timespan () ... }; #endif - + export_status->active_job = ExportStatus::Command; PBD::ScopedConnection command_connection; std::map subs; - subs.insert (std::pair ('f', filename)); - subs.insert (std::pair ('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 ('a', metadata.artist ())); subs.insert (std::pair ('b', PBD::basename_nosuffix (filename))); - subs.insert (std::pair ('s', session.path ())); + subs.insert (std::pair ('c', metadata.copyright ())); + subs.insert (std::pair ('d', Glib::path_get_dirname (filename) + G_DIR_SEPARATOR)); + subs.insert (std::pair ('f', filename)); + subs.insert (std::pair ('l', metadata.lyricist ())); subs.insert (std::pair ('n', session.name ())); + subs.insert (std::pair ('s', session.path ())); + subs.insert (std::pair ('o', metadata.conductor ())); + subs.insert (std::pair ('t', metadata.title ())); + subs.insert (std::pair ('z', metadata.organization ())); + subs.insert (std::pair ('A', metadata.album ())); + subs.insert (std::pair ('C', metadata.comment ())); + subs.insert (std::pair ('E', metadata.engineer ())); + subs.insert (std::pair ('G', metadata.genre ())); + subs.insert (std::pair ('L', total_tracks.str ())); + subs.insert (std::pair ('M', metadata.mixer ())); + subs.insert (std::pair ('N', current_timespan->name())); // =?= config_map.begin()->first->name () + subs.insert (std::pair ('O', metadata.composer ())); + subs.insert (std::pair ('P', metadata.producer ())); + subs.insert (std::pair ('S', metadata.disc_subtitle ())); + subs.insert (std::pair ('T', track_number.str ())); + subs.insert (std::pair ('Y', year.str ())); + subs.insert (std::pair ('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); } @@ -425,11 +473,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 */ @@ -505,10 +548,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()); } } @@ -796,7 +839,7 @@ ExportHandler::toc_escape_cdtext (const std::string& txt) 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)); }