summaryrefslogtreecommitdiff
path: root/libs/ardour/session_export.cc
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2016-07-14 04:34:18 +0200
committerRobin Gareus <robin@gareus.org>2016-07-14 04:35:48 +0200
commite55ef88ee9c95cb7e24077e78f459dbbbf615202 (patch)
tree7ea86fca55dbe72e25f0a2a6b81637618ab2c8d7 /libs/ardour/session_export.cc
parentd46e8a3d8b0077b9e31f02a1d024a41618f05704 (diff)
refactoring to prepare for real-time export
* add a threaded TmpFile Writer * update API calls to that process_export_fw() can be used as process_function The idea is to re-use export infrastructure from normalization: export to a tmp-file and then encode target formats after that.
Diffstat (limited to 'libs/ardour/session_export.cc')
-rw-r--r--libs/ardour/session_export.cc74
1 files changed, 50 insertions, 24 deletions
diff --git a/libs/ardour/session_export.cc b/libs/ardour/session_export.cc
index 1dee1f8d3c..84342fa3d9 100644
--- a/libs/ardour/session_export.cc
+++ b/libs/ardour/session_export.cc
@@ -104,13 +104,20 @@ Session::pre_export ()
/** Called for each range that is being exported */
int
-Session::start_audio_export (framepos_t position)
+Session::start_audio_export (framepos_t position, bool realtime)
{
if (!_exporting) {
pre_export ();
}
- _export_preroll = Config->get_export_preroll() * nominal_frame_rate ();
+ _realtime_export = realtime;
+
+ if (realtime) {
+ _export_preroll = nominal_frame_rate ();
+ } else {
+ _export_preroll = Config->get_export_preroll() * nominal_frame_rate ();
+ }
+
if (_export_preroll == 0) {
// must be > 0 so that transport is started in sync.
_export_preroll = 1;
@@ -170,12 +177,19 @@ Session::start_audio_export (framepos_t position)
return -1;
}
- _engine.Freewheel.connect_same_thread (export_freewheel_connection, boost::bind (&Session::process_export_fw, this, _1));
- _export_rolling = true;
- return _engine.freewheel (true);
+ if (_realtime_export) {
+ Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
+ _export_rolling = true;
+ process_function = &Session::process_export_fw;
+ return 0;
+ } else {
+ _engine.Freewheel.connect_same_thread (export_freewheel_connection, boost::bind (&Session::process_export_fw, this, _1));
+ _export_rolling = true;
+ return _engine.freewheel (true);
+ }
}
-int
+void
Session::process_export (pframes_t nframes)
{
if (_export_rolling && export_status->stop) {
@@ -201,26 +215,27 @@ Session::process_export (pframes_t nframes)
} catch (std::exception & e) {
error << string_compose (_("Export ended unexpectedly: %1"), e.what()) << endmsg;
export_status->abort (true);
- return -1;
}
-
- return 0;
}
-int
+void
Session::process_export_fw (pframes_t nframes)
{
if (_export_preroll > 0) {
- _engine.main_thread()->get_buffers ();
+ if (!_realtime_export) {
+ _engine.main_thread()->get_buffers ();
+ }
fail_roll (nframes);
- _engine.main_thread()->drop_buffers ();
+ if (!_realtime_export) {
+ _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;
+ return;
}
set_transport_speed (1.0, 0, false);
@@ -228,29 +243,36 @@ Session::process_export_fw (pframes_t nframes)
g_atomic_int_set (&_butler->should_do_transport_work, 0);
post_transport ();
- return 0;
+ return;
}
if (_export_latency > 0) {
framepos_t remain = std::min ((framepos_t)nframes, _export_latency);
- _engine.main_thread()->get_buffers ();
+ if (!_realtime_export) {
+ _engine.main_thread()->get_buffers ();
+ }
process_without_events (remain);
- _engine.main_thread()->drop_buffers ();
+ if (!_realtime_export) {
+ _engine.main_thread()->drop_buffers ();
+ }
_export_latency -= remain;
nframes -= remain;
if (nframes == 0) {
- return 0;
+ return;
}
}
-
- _engine.main_thread()->get_buffers ();
+ if (!_realtime_export) {
+ _engine.main_thread()->get_buffers ();
+ }
process_export (nframes);
- _engine.main_thread()->drop_buffers ();
+ if (!_realtime_export) {
+ _engine.main_thread()->drop_buffers ();
+ }
- return 0;
+ return;
}
int
@@ -279,9 +301,13 @@ Session::finalize_audio_export ()
/* Clean up */
- _engine.freewheel (false);
-
- export_freewheel_connection.disconnect();
+ if (_realtime_export) {
+ Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
+ process_function = &Session::process_with_events;
+ } else {
+ _engine.freewheel (false);
+ export_freewheel_connection.disconnect();
+ }
_mmc->enable_send (_pre_export_mmc_enabled);