X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsession_export.cc;h=efb731463f7151e2adcc50688e08f5669416655c;hb=6e94b1fb9f79c5bfcf22cd5b88619afa9bedb1b2;hp=da18ceb3cbc141ea090bb92df05612989b0bcce9;hpb=498dfebcca3b97cdd7b83444040042fe06626241;p=ardour.git diff --git a/libs/ardour/session_export.cc b/libs/ardour/session_export.cc index da18ceb3cb..efb731463f 100644 --- a/libs/ardour/session_export.cc +++ b/libs/ardour/session_export.cc @@ -17,21 +17,19 @@ */ -#include #include "pbd/error.h" -#include +#include + +#include -#include "ardour/audio_diskstream.h" #include "ardour/audioengine.h" #include "ardour/butler.h" -#include "ardour/export_failed.h" -#include "ardour/export_file_io.h" #include "ardour/export_handler.h" #include "ardour/export_status.h" -#include "ardour/export_utilities.h" -#include "ardour/route.h" +#include "ardour/process_thread.h" #include "ardour/session.h" +#include "ardour/track.h" #include "i18n.h" @@ -65,8 +63,6 @@ Session::pre_export () { get_export_status (); // Init export_status - _butler->wait_until_finished (); - /* take everyone out of awrite to avoid disasters */ { @@ -77,12 +73,16 @@ Session::pre_export () } } - /* make sure we are actually rolling */ + /* prepare transport */ + + realtime_stop (true, true); if (get_record_enabled()) { disable_record (false); } + unset_play_loop (); + /* no slaving */ post_export_sync = config.get_external_sync (); @@ -91,27 +91,42 @@ Session::pre_export () config.set_external_sync (false); _exporting = true; - export_status->running = true; - export_status->Aborting.connect (sigc::hide_return (sigc::mem_fun (*this, &Session::stop_audio_export))); - export_status->Finished.connect (sigc::hide_return (sigc::mem_fun (*this, &Session::finalize_audio_export))); + export_status->set_running (true); + export_status->Finished.connect_same_thread (*this, boost::bind (&Session::finalize_audio_export, this)); + + /* disable MMC output early */ + + _pre_export_mmc_enabled = _mmc->send_enabled (); + _mmc->enable_send (false); return 0; } +/** Called for each range that is being exported */ int -Session::start_audio_export (nframes_t position, bool realtime) +Session::start_audio_export (framepos_t position) { if (!_exporting) { pre_export (); } + _export_preroll = Config->get_export_preroll() * nominal_frame_rate (); + + /* We're about to call Track::seek, so the butler must have finished everything + up otherwise it could be doing do_refill in its thread while we are doing + it here. + */ + + _butler->wait_until_finished (); + /* get everyone to the right position */ { - boost::shared_ptr dsl = diskstreams.reader(); + boost::shared_ptr rl = routes.reader(); - for (DiskstreamList::iterator i = dsl->begin(); i != dsl->end(); ++i) { - if ((*i)-> seek (position, true)) { + for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) { + boost::shared_ptr tr = boost::dynamic_pointer_cast (*i); + if (tr && tr->seek (position, true)) { error << string_compose (_("%1: cannot seek to %2 for export"), (*i)->name(), position) << endmsg; @@ -126,8 +141,6 @@ Session::start_audio_export (nframes_t position, bool realtime) */ _transport_frame = position; - - _exporting_realtime = realtime; export_status->stop = false; /* get transport ready. note how this is calling butler functions @@ -136,109 +149,113 @@ Session::start_audio_export (nframes_t position, bool realtime) since then has re-awakened it. */ - set_transport_speed (1.0, false); - butler_transport_work (); - g_atomic_int_set (&_butler->should_do_transport_work, 0); - post_transport (); - /* we are ready to go ... */ if (!_engine.connected()) { return -1; } - if (realtime) { - last_process_function = process_function; - process_function = &Session::process_export; - } else { - export_freewheel_connection = _engine.Freewheel.connect (sigc::mem_fun (*this, &Session::process_export_fw)); - return _engine.freewheel (true); - } - - return 0; + _engine.Freewheel.connect_same_thread (export_freewheel_connection, boost::bind (&Session::process_export_fw, this, _1)); + _export_rolling = true; + return _engine.freewheel (true); } -void -Session::process_export (nframes_t nframes) +int +Session::process_export (pframes_t nframes) { - try { - - if (export_status->stop) { - stop_audio_export (); - return; - } + if (_export_rolling && export_status->stop) { + stop_audio_export (); + } - if (!_exporting_realtime) { - /* make sure we've caught up with disk i/o, since - we're running faster than realtime c/o JACK. - */ - - _butler->wait_until_finished (); - } + if (_export_rolling) { + /* make sure we've caught up with disk i/o, since + we're running faster than realtime c/o JACK. + */ + _butler->wait_until_finished (); /* do the usual stuff */ process_without_events (nframes); + } - /* handle export */ + try { + /* handle export - XXX what about error handling? */ ProcessExport (nframes); - } catch (ExportFailed e) { + } catch (std::exception & e) { + error << string_compose (_("Export ended unexpectedly: %1"), e.what()) << endmsg; export_status->abort (true); + return -1; } + + return 0; } int -Session::process_export_fw (nframes_t nframes) +Session::process_export_fw (pframes_t nframes) { + if (_export_preroll > 0) { + + _engine.main_thread()->get_buffers (); + fail_roll (nframes); + _engine.main_thread()->drop_buffers (); + + _export_preroll -= std::min ((framepos_t)nframes, _export_preroll); + + if (_export_preroll > 0) { + // clear out buffers (reverb tails etc). + return 0; + } + + set_transport_speed (1.0, 0, false); + butler_transport_work (); + g_atomic_int_set (&_butler->should_do_transport_work, 0); + post_transport (); + return 0; + } + + _engine.main_thread()->get_buffers (); process_export (nframes); + _engine.main_thread()->drop_buffers (); + return 0; } int Session::stop_audio_export () { - if (_exporting_realtime) { - process_function = last_process_function; - } else { - export_freewheel_connection.disconnect(); - } - /* can't use stop_transport() here because we need an immediate halt and don't require all the declick stuff that stop_transport() implements. */ realtime_stop (true, true); + _export_rolling = false; _butler->schedule_transport_work (); - if (!export_status->aborted()) { - ExportReadFinished (); - } else { - finalize_audio_export (); - } - return 0; - } void Session::finalize_audio_export () { _exporting = false; - export_status->running = false; - if (!_exporting_realtime) { - _engine.freewheel (false); - _exporting_realtime = false; + if (_export_rolling) { + stop_audio_export (); } /* Clean up */ - ProcessExport.clear(); - ExportReadFinished.clear(); + _engine.freewheel (false); + export_freewheel_connection.disconnect(); + + _mmc->enable_send (_pre_export_mmc_enabled); + + /* maybe write CUE/TOC */ + export_handler.reset(); export_status.reset(); @@ -247,6 +264,6 @@ Session::finalize_audio_export () if (post_export_sync) { config.set_external_sync (true); } else { - locate (post_export_position, false, false, false); + locate (post_export_position, false, false, false, false, false); } }