X-Git-Url: https://main.carlh.net/gitweb/?p=ardour.git;a=blobdiff_plain;f=libs%2Fardour%2Fexport_handler.cc;h=ac2f7b0bd37ac1718219eb46666938fcdf6cfbcc;hp=46cd247d20496d8fd8cef872ba180ea720c3035d;hb=c8c6bca6587450ff64303dbc994a4cd28d6ce7aa;hpb=d1747b4137ba9c3986d644db383aacc682059bf7 diff --git a/libs/ardour/export_handler.cc b/libs/ardour/export_handler.cc index 46cd247d20..ac2f7b0bd3 100644 --- a/libs/ardour/export_handler.cc +++ b/libs/ardour/export_handler.cc @@ -20,12 +20,13 @@ #include "ardour/export_handler.h" -#include +#include "pbd/gstdio_compat.h" #include #include #include "pbd/convert.h" +#include "ardour/audioengine.h" #include "ardour/audiofile_tagger.h" #include "ardour/debug.h" #include "ardour/export_graph_builder.h" @@ -40,7 +41,7 @@ #include "pbd/basename.h" #include "ardour/session_metadata.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace PBD; @@ -110,7 +111,7 @@ ExportHandler::ExportHandler (Session & session) , session (session) , graph_builder (new ExportGraphBuilder (session)) , export_status (session.get_export_status ()) - , normalizing (false) + , post_processing (false) , cue_tracknum (0) , cue_indexnum (0) { @@ -148,8 +149,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 +170,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 +178,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; @@ -180,19 +190,20 @@ ExportHandler::start_timespan () graph_builder->reset (); graph_builder->set_current_timespan (current_timespan); handle_duplicate_format_extensions(); + bool realtime = current_timespan->realtime (); for (ConfigMap::iterator it = timespan_bounds.first; it != timespan_bounds.second; ++it) { // Filenames can be shared across timespans FileSpec & spec = it->second; spec.filename->set_timespan (it->first); - graph_builder->add_config (spec); + graph_builder->add_config (spec, realtime); } /* start export */ - normalizing = false; + post_processing = false; session.ProcessExport.connect_same_thread (process_connection, boost::bind (&ExportHandler::process, this, _1)); process_position = current_timespan->get_start(); - session.start_audio_export (process_position); + session.start_audio_export (process_position, realtime); } void @@ -219,11 +230,18 @@ ExportHandler::handle_duplicate_format_extensions() int ExportHandler::process (framecnt_t frames) { - if (!export_status->running) { + if (!export_status->running ()) { return 0; - } else if (normalizing) { - return process_normalize (); + } else if (post_processing) { + Glib::Threads::Mutex::Lock l (export_status->lock()); + if (AudioEngine::instance()->freewheeling ()) { + return post_process (); + } else { + // wait until we're freewheeling + return 0; + } } else { + Glib::Threads::Mutex::Lock l (export_status->lock()); return process_timespan (frames); } } @@ -231,6 +249,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; @@ -252,12 +271,12 @@ ExportHandler::process_timespan (framecnt_t frames) /* Do actual processing */ int ret = graph_builder->process (frames_to_read, last_cycle); - /* Start normalizing if necessary */ + /* Start post-processing/normalizing if necessary */ if (last_cycle) { - normalizing = graph_builder->will_normalize(); - if (normalizing) { - export_status->total_normalize_cycles = graph_builder->get_normalize_cycle_count(); - export_status->current_normalize_cycle = 0; + post_processing = graph_builder->need_postprocessing (); + if (post_processing) { + export_status->total_postprocessing_cycles = graph_builder->get_postprocessing_cycle_count(); + export_status->current_postprocessing_cycle = 0; } else { finish_timespan (); return 0; @@ -268,16 +287,20 @@ ExportHandler::process_timespan (framecnt_t frames) } int -ExportHandler::process_normalize () +ExportHandler::post_process () { - if (graph_builder->process_normalize ()) { + if (graph_builder->post_process ()) { finish_timespan (); - export_status->normalizing = false; + export_status->active_job = ExportStatus::Exporting; } else { - export_status->normalizing = true; + if (graph_builder->realtime ()) { + export_status->active_job = ExportStatus::Encoding; + } else { + export_status->active_job = ExportStatus::Normalizing; + } } - export_status->current_normalize_cycle++; + export_status->current_postprocessing_cycle++; return 0; } @@ -292,11 +315,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,13 +333,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()) { + /* TODO: check Umlauts and encoding in filename. + * TagLib eventually calls CreateFileA(), + */ + 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 }, @@ -323,25 +360,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); } @@ -418,11 +484,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 +559,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 +618,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 +742,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; } @@ -789,7 +850,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)); } @@ -809,7 +870,7 @@ ExportHandler::toc_escape_cdtext (const std::string& txt) out += buf; } } - + out += '"'; return out; @@ -834,7 +895,7 @@ ExportHandler::toc_escape_filename (const std::string& txt) out += *c; } } - + out += '"'; return out; @@ -845,15 +906,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;