make step edit cursor follow zoom (and change its color a bit)

[ardour.git] / gtk2_ardour / selection.h

diff --git a/gtk2_ardour/selection.h b/gtk2_ardour/selection.h
index 739d3b4c016e3ab290f2ace34d7be44922916753..e81e1bdea8624460f0c345c884c5ae2db67b144c 100644 (file)
--- a/gtk2_ardour/selection.h
+++ b/gtk2_ardour/selection.h
@@ -22,10 +22,11 @@
 
 #include <vector>
 #include <boost/shared_ptr.hpp>
+#include <boost/noncopyable.hpp>
 
 #include <sigc++/signal.h>
 
-#include "pbd/scoped_connections.h"
+#include "pbd/signals.h"
 
 #include "time_selection.h"
 #include "region_selection.h"
@@ -42,6 +43,9 @@ class RegionView;
 class Selectable;
 class PublicEditor;
 class MidiRegionView;
+class AutomationLine;
+class ControlPoint;
+
 
 namespace ARDOUR {
        class Region;
@@ -84,9 +88,7 @@ class Selection : public sigc::trackable, public PBD::ScopedConnectionList
        MidiRegionSelection  midi_regions;
        MidiNoteSelection    midi_notes;
 
-       Selection (PublicEditor const * e) : tracks (e), editor (e), next_time_id (0) {
-               clear();
-       }
+       Selection (PublicEditor const * e);
 
        // Selection& operator= (const Selection& other);
 
@@ -109,9 +111,9 @@ class Selection : public sigc::trackable, public PBD::ScopedConnectionList
        bool selected (RegionView*);
        bool selected (Marker*);
 
-       void set (std::list<Selectable*>&);
-       void add (std::list<Selectable*>&);
-       void toggle (std::list<Selectable*>&);
+       void set (std::list<Selectable*> const &);
+       void add (std::list<Selectable*> const &);
+       void toggle (std::list<Selectable*> const &);
 
        void set (TimeAxisView*);
        void set (const TrackViewList&);
@@ -123,7 +125,7 @@ class Selection : public sigc::trackable, public PBD::ScopedConnectionList
        void set (boost::shared_ptr<Evoral::ControlList>);
        void set (boost::shared_ptr<ARDOUR::Playlist>);
        void set (const std::list<boost::shared_ptr<ARDOUR::Playlist> >&);
-       void set (AutomationSelectable*);
+       void set (ControlPoint *);
        void set (Marker*);
        void set (const RegionSelection&);
 
@@ -138,7 +140,8 @@ class Selection : public sigc::trackable, public PBD::ScopedConnectionList
        void toggle (ARDOUR::AutomationList*);
        void toggle (boost::shared_ptr<ARDOUR::Playlist>);
        void toggle (const std::list<boost::shared_ptr<ARDOUR::Playlist> >&);
-       void toggle (const std::vector<AutomationSelectable*>&);
+       void toggle (ControlPoint *);
+       void toggle (std::vector<ControlPoint*> const &);
        void toggle (Marker*);
 
        void add (TimeAxisView*);
@@ -152,6 +155,8 @@ class Selection : public sigc::trackable, public PBD::ScopedConnectionList
        void add (boost::shared_ptr<Evoral::ControlList>);
        void add (boost::shared_ptr<ARDOUR::Playlist>);
        void add (const std::list<boost::shared_ptr<ARDOUR::Playlist> >&);
+       void add (ControlPoint *);
+       void add (std::vector<ControlPoint*> const &);
        void add (Marker*);
        void add (const std::list<Marker*>&);
        void add (const RegionSelection&);
@@ -187,11 +192,10 @@ class Selection : public sigc::trackable, public PBD::ScopedConnectionList
        template<class A> void foreach_region (void (ARDOUR::Region::*method)(A), A arg);
 
   private:
-       Selection (const Selection& other) {}
+       void set_point_selection_from_line (AutomationLine const &);
+
        PublicEditor const * editor;
        uint32_t next_time_id;
-       
-       void add (std::vector<AutomationSelectable*>&);
 };
 
 bool operator==(const Selection& a, const Selection& b);