Prefer const references: Beat-Converter does not modify the TempoMap

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

diff --git a/libs/ardour/ardour/presentation_info.h b/libs/ardour/ardour/presentation_info.h
index 91238e6537d0fb840453ff6b7f2c9ade33a68886..7c847e9fce8e9b7c263c739670d5909e0072b9d3 100644 (file)
--- a/libs/ardour/ardour/presentation_info.h
+++ b/libs/ardour/ardour/presentation_info.h
@@ -125,7 +125,9 @@ class LIBARDOUR_API PresentationInfo : public PBD::Stateful
                OrderSet = 0x400,
 
                /* special mask to delect out "state" bits */
-               StatusMask = (Selected|Hidden)
+               StatusMask = (Selected|Hidden),
+               /* special mask to delect select type bits */
+               TypeMask = (AudioBus|AudioTrack|MidiTrack|MidiBus|VCA|MasterOut|MonitorOut|Auditioner)
        };
 
        static const Flag AllStripables; /* mask to use for any route or VCA (but not auditioner) */
@@ -156,6 +158,8 @@ class LIBARDOUR_API PresentationInfo : public PBD::Stateful
 
        bool order_set() const { return _flags & OrderSet; }
 
+       int selection_cnt() const { return _selection_cnt; }
+
        bool hidden() const { return _flags & Hidden; }
        bool selected() const { return _flags & Selected; }
        bool special() const { return _flags & (MasterOut|MonitorOut|Auditioner); }
@@ -205,10 +209,13 @@ class LIBARDOUR_API PresentationInfo : public PBD::Stateful
                        return true;
                }
 
-               /* compare without status mask - we already checked that above 
+               /* check for any matching type bits.
+                *
+                * Do comparisoon without status mask or order set bits - we
+                * already checked that above.
                 */
 
-               return (f &~ (StatusMask|OrderSet)) == (_flags &~ (StatusMask|OrderSet));
+               return ((f & TypeMask) & _flags);
        }
 
        int set_state (XMLNode const&, int);
@@ -227,15 +234,29 @@ class LIBARDOUR_API PresentationInfo : public PBD::Stateful
        static Flag get_flags (XMLNode const& node);
        static std::string state_node_name;
 
-       /* for things concerned about *any* PresentationInfo. This is emitted
-        * only at the request of another object that has finished making some
-        * changes (e.g. reordering things)
+       /* for things concerned about *any* PresentationInfo.
         */
 
-       static PBD::Signal0<void> Change;
+       static PBD::Signal1<void,PBD::PropertyChange const &> Change;
 
        static void make_property_quarks ();
 
+  protected:
+       friend class ChangeSuspender;
+       static void suspend_change_signal ();
+       static void unsuspend_change_signal ();
+
+  public:
+       class ChangeSuspender {
+          public:
+               ChangeSuspender() {
+                       PresentationInfo::suspend_change_signal ();
+               }
+               ~ChangeSuspender() {
+                       PresentationInfo::unsuspend_change_signal ();
+               }
+       };
+
   protected:
        friend class Stripable;
        void set_order (order_t order);
@@ -244,6 +265,14 @@ class LIBARDOUR_API PresentationInfo : public PBD::Stateful
        order_t _order;
        Flag    _flags;
        color_t _color;
+       int     _selection_cnt;
+
+       static PBD::PropertyChange _pending_static_changes;
+       static Glib::Threads::Mutex static_signal_lock;
+       static int _change_signal_suspended;
+       static void send_static_change (const PBD::PropertyChange&);
+
+       static int selection_counter;
 };
 
 }