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/export_channel.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/export_channel.cc')
| -rw-r--r-- | libs/ardour/export_channel.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/ardour/export_channel.cc b/libs/ardour/export_channel.cc index 8deb31956d..9b3f50e85d 100644 --- a/libs/ardour/export_channel.cc +++ b/libs/ardour/export_channel.cc @@ -214,9 +214,9 @@ RouteExportChannel::~RouteExportChannel() } void -RouteExportChannel::create_from_route(std::list<ExportChannelPtr> & result, Route & route) +RouteExportChannel::create_from_route(std::list<ExportChannelPtr> & result, boost::shared_ptr<Route> route) { - boost::shared_ptr<CapturingProcessor> processor = route.add_export_point(); + boost::shared_ptr<CapturingProcessor> processor = route->add_export_point(); uint32_t channels = processor->input_streams().n_audio(); boost::shared_ptr<ProcessorRemover> remover (new ProcessorRemover (route, processor)); @@ -271,5 +271,5 @@ RouteExportChannel::operator< (ExportChannel const & other) const RouteExportChannel::ProcessorRemover::~ProcessorRemover() { - route.remove_processor (processor); + route->remove_processor (processor); } |