Merge branch 'master' into windows

[ardour.git] / libs / ardour / ardour / export_channel.h

diff --git a/libs/ardour/ardour/export_channel.h b/libs/ardour/ardour/export_channel.h
index a73d04aa36d37a603e60b95bac5df739a408f316..f3244095a3125cdb55b0aaee78bb54ee5d6aada1 100644 (file)
--- a/libs/ardour/ardour/export_channel.h
+++ b/libs/ardour/ardour/export_channel.h
@@ -23,9 +23,8 @@
 
 #include <set>
 
-#include <boost/signals2.hpp>
-#include <boost/shared_ptr.hpp>
 #include <boost/scoped_array.hpp>
+#include <boost/shared_ptr.hpp>
 
 #include "pbd/signals.h"
 
@@ -66,7 +65,7 @@ class ExportChannel : public boost::less_than_comparable<ExportChannel>
 class PortExportChannel : public ExportChannel
 {
   public:
-       typedef std::set<AudioPort *> PortSet;
+       typedef std::set<boost::weak_ptr<AudioPort> > PortSet;
 
        PortExportChannel ();
        void set_max_buffer_size(framecnt_t frames);
@@ -79,7 +78,7 @@ class PortExportChannel : public ExportChannel
 
        bool operator< (ExportChannel const & other) const;
 
-       void add_port (AudioPort * port) { ports.insert (port); }
+       void add_port (boost::weak_ptr<AudioPort> port) { ports.insert (port); }
        PortSet const & get_ports () { return ports; }
 
   private:
@@ -94,6 +93,7 @@ class RegionExportChannelFactory
 {
   public:
        enum Type {
+               None,
                Raw,
                Fades,
                Processed
@@ -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;
        };