X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fselection.h;h=ded71c65e5a8f67a334b73615ed2c9cc03cd7aef;hb=57d2555d3e7857c44daedd1d51f777d0c50b27c4;hp=3a6e7ff3aede1f5930890bc88b1602efa295e968;hpb=b6f4cdaea27fbf49f924b2684d4c638089314067;p=ardour.git

diff --git a/gtk2_ardour/selection.h b/gtk2_ardour/selection.h
index 3a6e7ff3ae..ded71c65e5 100644
--- a/gtk2_ardour/selection.h
+++ b/gtk2_ardour/selection.h
@@ -43,6 +43,9 @@ class RegionView;
 class Selectable;
 class PublicEditor;
 class MidiRegionView;
+class AutomationLine;
+class ControlPoint;
+
 
 namespace ARDOUR {
 	class Region;
@@ -83,6 +86,8 @@ class Selection : public sigc::trackable, public PBD::ScopedConnectionList
 	PointSelection       points;
 	MarkerSelection      markers;
 	MidiRegionSelection  midi_regions;
+
+	/** only used when this class is used as a cut buffer */
 	MidiNoteSelection    midi_notes;
 
 	Selection (PublicEditor const * e);
@@ -108,9 +113,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&);
@@ -118,11 +123,12 @@ class Selection : public sigc::trackable, public PBD::ScopedConnectionList
 	void set (RegionView*, bool also_clear_tracks = true);
 	void set (MidiRegionView*);
 	void set (std::vector<RegionView*>&);
-	long set (nframes_t, nframes_t);
+	long set (framepos_t, framepos_t);
+	void set_preserving_all_ranges (framepos_t, framepos_t);
 	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&);
 
@@ -133,11 +139,12 @@ class Selection : public sigc::trackable, public PBD::ScopedConnectionList
 	void toggle (MidiRegionView*);
 	void toggle (MidiCutBuffer*);
 	void toggle (std::vector<RegionView*>&);
-	long toggle (nframes_t, nframes_t);
+	long toggle (framepos_t, framepos_t);
 	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*);
@@ -147,10 +154,12 @@ class Selection : public sigc::trackable, public PBD::ScopedConnectionList
 	void add (MidiRegionView*);
 	void add (MidiCutBuffer*);
 	void add (std::vector<RegionView*>&);
-	long add (nframes_t, nframes_t);
+	long add (framepos_t, framepos_t);
 	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&);
@@ -161,14 +170,16 @@ class Selection : public sigc::trackable, public PBD::ScopedConnectionList
 	void remove (MidiRegionView*);
 	void remove (MidiCutBuffer*);
 	void remove (uint32_t selection_id);
-	void remove (nframes_t, nframes_t);
+	void remove (framepos_t, framepos_t);
 	void remove (boost::shared_ptr<ARDOUR::AutomationList>);
 	void remove (boost::shared_ptr<ARDOUR::Playlist>);
 	void remove (const std::list<boost::shared_ptr<ARDOUR::Playlist> >&);
 	void remove (const std::list<Selectable*>&);
 	void remove (Marker*);
 
-	void replace (uint32_t time_index, nframes_t start, nframes_t end);
+	void remove_regions (TimeAxisView *);
+
+	void replace (uint32_t time_index, framepos_t start, framepos_t end);
 
 	void clear_regions();
 	void clear_tracks ();
@@ -185,11 +196,14 @@ class Selection : public sigc::trackable, public PBD::ScopedConnectionList
 	void foreach_midi_regionview (void (MidiRegionView::*method)(void));
 	template<class A> void foreach_region (void (ARDOUR::Region::*method)(A), A arg);
 
+	XMLNode& get_state () const;
+	int set_state (XMLNode const &, int);
+
   private:
+	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);