Prevent note creation drags with no movement of the pointer. May fix #3159.

[ardour.git] / gtk2_ardour / port_group.h

diff --git a/gtk2_ardour/port_group.h b/gtk2_ardour/port_group.h
index 6940b75093d723310e5ab9f9d6b58f1545cd0bd1..17d1963e1908632a9d576dee907ad8ae57794267 100644 (file)
--- a/gtk2_ardour/port_group.h
+++ b/gtk2_ardour/port_group.h
@@ -23,9 +23,12 @@
 #include <vector>
 #include <string>
 #include <set>
+#include <boost/shared_ptr.hpp>
+#include "pbd/signals.h"
+
 #include <gtkmm/widget.h>
 #include <gtkmm/checkbutton.h>
-#include <boost/shared_ptr.hpp>
+
 #include "ardour/data_type.h"
 #include "ardour/types.h"
 
@@ -40,14 +43,14 @@ class PortMatrix;
 class RouteBundle;
 class PublicEditor;
 
-/** A list of bundles and ports, grouped by some aspect of their
- *  type e.g. busses, tracks, system.  Each group has 0 or more bundles
- *  and 0 or more ports, where the ports are not in the bundles.
+/** A list of bundles grouped by some aspect of their type e.g. busses, tracks, system.
+ *  A group has 0 or more bundles.
  */
 class PortGroup : public sigc::trackable
 {
 public:
        PortGroup (std::string const & n);
+       ~PortGroup ();
 
        void add_bundle (boost::shared_ptr<ARDOUR::Bundle>, bool allow_dups = false);
        void add_bundle (boost::shared_ptr<ARDOUR::Bundle>, boost::shared_ptr<ARDOUR::IO> io);
@@ -57,25 +60,31 @@ public:
        void clear ();
        uint32_t total_channels () const;
        boost::shared_ptr<ARDOUR::IO> io_from_bundle (boost::shared_ptr<ARDOUR::Bundle>) const;
+       void remove_duplicates ();
 
        std::string name; ///< name for the group
 
        bool has_port (std::string const &) const;
 
-       sigc::signal<void> Changed;
-       sigc::signal<void, ARDOUR::Bundle::Change> BundleChanged;
+       /** The bundle list has changed in some way; a bundle has been added or removed, or the list cleared etc. */
+       PBD::Signal0<void> Changed;
+
+       /** An individual bundle on our list has changed in some way */
+       PBD::Signal1<void,ARDOUR::Bundle::Change> BundleChanged;
 
        struct BundleRecord {
-               boost::shared_ptr<ARDOUR::Bundle> bundle;
-               /** IO whose ports are in the bundle, or 0.  This is so that we can do things like adding
-                   ports to the IO from matrix editor menus. */
-               boost::shared_ptr<ARDOUR::IO> io; 
-               Gdk::Color colour;
-               bool has_colour;
-               sigc::connection changed_connection;
+           boost::shared_ptr<ARDOUR::Bundle> bundle;
+           /** IO whose ports are in the bundle, or 0.  This is so that we can do things like adding
+               ports to the IO from matrix editor menus. */
+           boost::shared_ptr<ARDOUR::IO> io; 
+           Gdk::Color colour;
+           bool has_colour;
+           PBD::ScopedConnection changed_connection;
+
+           BundleRecord (boost::shared_ptr<ARDOUR::Bundle>, boost::shared_ptr<ARDOUR::IO>, Gdk::Color, bool has_colour);
        };
 
-       typedef std::list<BundleRecord> BundleList;
+       typedef std::list<BundleRecord*> BundleList;
 
        BundleList const & bundles () const {
                return _bundles;
@@ -93,13 +102,14 @@ class PortGroupList : public sigc::trackable
 {
   public:
        PortGroupList ();
+       ~PortGroupList();
 
        typedef std::vector<boost::shared_ptr<PortGroup> > List;
 
        void add_group (boost::shared_ptr<PortGroup>);
        void add_group_if_not_empty (boost::shared_ptr<PortGroup>);
        void set_type (ARDOUR::DataType);
-       void gather (ARDOUR::Session &, bool, bool);
+       void gather (ARDOUR::Session *, bool, bool);
        PortGroup::BundleList const & bundles () const;
        void clear ();
        void remove_bundle (boost::shared_ptr<ARDOUR::Bundle>);
@@ -122,8 +132,11 @@ class PortGroupList : public sigc::trackable
 
        bool empty () const;
 
-       sigc::signal<void> Changed;
-       sigc::signal<void, ARDOUR::Bundle::Change> BundleChanged;
+       /** The group list has changed in some way; a group has been added or removed, or the list cleared etc. */
+       PBD::Signal0<void> Changed;
+
+       /** A bundle in one of our groups has changed */
+       PBD::Signal1<void,ARDOUR::Bundle::Change> BundleChanged;
 
   private:
        bool port_has_prefix (std::string const &, std::string const &) const;
@@ -139,7 +152,8 @@ class PortGroupList : public sigc::trackable
        ARDOUR::DataType _type;
        mutable PortGroup::BundleList _bundles;
        List _groups;
-       std::vector<sigc::connection> _bundle_changed_connections;
+       PBD::ScopedConnectionList _bundle_changed_connections;
+       PBD::ScopedConnectionList _changed_connections;
        bool _signals_suspended;
        bool _pending_change;
        ARDOUR::Bundle::Change _pending_bundle_change;