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/ardour/export_channel.h | |
| 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/ardour/export_channel.h')
| -rw-r--r-- | libs/ardour/ardour/export_channel.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/ardour/ardour/export_channel.h b/libs/ardour/ardour/export_channel.h index 6f9682018c..f3244095a3 100644 --- a/libs/ardour/ardour/export_channel.h +++ b/libs/ardour/ardour/export_channel.h @@ -161,7 +161,7 @@ class RouteExportChannel : public ExportChannel boost::shared_ptr<ProcessorRemover> remover); ~RouteExportChannel(); - static void create_from_route(std::list<ExportChannelPtr> & result, Route & route); + static void create_from_route(std::list<ExportChannelPtr> & result, boost::shared_ptr<Route> route); public: // ExportChannel interface void set_max_buffer_size(framecnt_t frames); @@ -179,11 +179,11 @@ class RouteExportChannel : public ExportChannel // Removes the processor from the track when deleted class ProcessorRemover { public: - ProcessorRemover (Route & route, boost::shared_ptr<CapturingProcessor> processor) + ProcessorRemover (boost::shared_ptr<Route> route, boost::shared_ptr<CapturingProcessor> processor) : route (route), processor (processor) {} ~ProcessorRemover(); private: - Route & route; + boost::shared_ptr<Route> route; boost::shared_ptr<CapturingProcessor> processor; }; |