diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2012-12-06 19:56:33 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-12-06 19:56:33 +0000 |
commit | 9884773eea9764b6dacd3ade6a1d49cf389fe398 (patch) | |
tree | b46b3e936a09bf40954c6b3f00ebc7f59f632723 /libs/ardour/audioengine.cc | |
parent | 27bfb0f9e2db321d9596912ed95ccb6bcd00bc57 (diff) |
various fixes for exporting, including correct handling of errors during export which previously would hang when using jack1 because jack_set_freewheel() was called from inside a process() callback; use shared_ptr<Route> in parts of export code that weren't using them before; fix up generation of export filenames so that Glib::build_filename() is used and non-existent folders are ignored
git-svn-id: svn://localhost/ardour2/branches/3.0@13610 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/audioengine.cc')
-rw-r--r-- | libs/ardour/audioengine.cc | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc index 90ff62f2a1..dffd65556a 100644 --- a/libs/ardour/audioengine.cc +++ b/libs/ardour/audioengine.cc @@ -547,16 +547,13 @@ AudioEngine::process_callback (pframes_t nframes) } /* test if we are freewheeling and there are freewheel signals connected. - ardour should act normally even when freewheeling unless /it/ is exporting */ - + ardour should act normally even when freewheeling unless /it/ is + exporting + */ if (_freewheeling && !Freewheel.empty()) { - /* emit the Freewheel signal and stop freewheeling in the event of trouble - */ - boost::optional<int> r = Freewheel (nframes); - if (r.get_value_or (0)) { - jack_set_freewheel (_priv_jack, false); - } + + Freewheel (nframes); } else { MIDI::Manager::instance()->cycle_start(nframes); |