provide access to Send + Plugins from MIDI binding maps

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

diff --git a/libs/ardour/ardour/io.h b/libs/ardour/ardour/io.h
index 9a13ced942471f5e9aaf1bda7bde63c604e64dda..b718cfa5c9aeeed5b22ef460892d481f929a7ff7 100644 (file)
--- a/libs/ardour/ardour/io.h
+++ b/libs/ardour/ardour/io.h
@@ -23,7 +23,6 @@
 #include <string>
 #include <vector>
 #include <cmath>
-#include <sigc++/signal.h>
 #include <jack/jack.h>
 
 #include <glibmm/thread.h>
@@ -133,11 +132,11 @@ class IO : public SessionObject, public Latent
 
        const ChanCount& n_ports ()  const { return _ports.count(); }
 
-       sigc::signal<void,IOChange,void*> changed;
+       PBD::Signal2<void,IOChange,void*> changed;
 
        virtual XMLNode& state (bool full);
        XMLNode& get_state (void);
-       int set_state (const XMLNode&, int version = 3000);
+       int set_state (const XMLNode&, int version);
        int set_state_2X (const XMLNode&, int, bool);
 
        static int  disable_connecting (void);
@@ -145,7 +144,7 @@ class IO : public SessionObject, public Latent
        static int  disable_ports (void);
        static int  enable_ports (void);
 
-       static sigc::signal<void,ChanCount> PortCountChanged; // emitted when the number of ports changes
+       static PBD::Signal1<void,ChanCount> PortCountChanged; // emitted when the number of ports changes
 
        static std::string name_from_state (const XMLNode&);
        static void set_name_in_state (XMLNode&, const std::string&);
@@ -153,7 +152,7 @@ class IO : public SessionObject, public Latent
        /* we have to defer/order port connection. this is how we do it.
        */
 
-       static sigc::signal<int> ConnectingLegal;
+       static PBD::Signal0<int> ConnectingLegal;
        static bool              connecting_legal;
 
        XMLNode *pending_state_node;
@@ -180,20 +179,18 @@ class IO : public SessionObject, public Latent
        bool     _active;
 
   private:
-
        int connecting_became_legal ();
-       sigc::connection connection_legal_c;
+       PBD::ScopedConnection connection_legal_c;
 
        boost::shared_ptr<Bundle> _bundle; ///< a bundle representing our ports
 
        struct UserBundleInfo {
-               UserBundleInfo (IO*, boost::shared_ptr<UserBundle> b);
-
-               boost::shared_ptr<UserBundle> bundle;
-               sigc::connection changed;
+           UserBundleInfo (IO*, boost::shared_ptr<UserBundle> b);
+           boost::shared_ptr<UserBundle> bundle;
+           PBD::ScopedConnection changed;
        };
-
-       std::vector<UserBundleInfo> _bundles_connected; ///< user bundles connected to our ports
+       
+       std::vector<UserBundleInfo*> _bundles_connected; ///< user bundles connected to our ports
 
        static int parse_io_string (const std::string&, std::vector<std::string>& chns);
        static int parse_gain_string (const std::string&, std::vector<std::string>& chns);
@@ -201,11 +198,10 @@ class IO : public SessionObject, public Latent
        int ensure_ports (ChanCount, bool clear, bool lockit, void *src);
 
        void check_bundles_connected ();
-       void check_bundles (std::vector<UserBundleInfo>&, const PortSet&);
+       void check_bundles (std::vector<UserBundleInfo*>&, const PortSet&);
 
        void bundle_changed (Bundle::Change);
 
-
        int get_port_counts (const XMLNode& node, int version, ChanCount& n, boost::shared_ptr<Bundle>& c);
        int get_port_counts_2X (const XMLNode& node, int version, ChanCount& n, boost::shared_ptr<Bundle>& c);
        int create_ports (const XMLNode&, int version);
@@ -219,7 +215,7 @@ class IO : public SessionObject, public Latent
        std::string build_legal_port_name (DataType type);
        int32_t find_port_hole (const char* base);
 
-       void setup_bundles ();
+       void setup_bundle ();
        std::string bundle_channel_name (uint32_t, uint32_t) const;
 };