X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fselection.h;h=ded71c65e5a8f67a334b73615ed2c9cc03cd7aef;hb=11e907770a0a7bceea240de30517f2237e5fe128;hp=4e5f684af9a305673c33343fb62e27c5a3dbfd0c;hpb=bb9cc45cd22af67ac275a5e73accbe14fee664d8;p=ardour.git

diff --git a/gtk2_ardour/selection.h b/gtk2_ardour/selection.h
index 4e5f684af9..ded71c65e5 100644
--- a/gtk2_ardour/selection.h
+++ b/gtk2_ardour/selection.h
@@ -22,9 +22,12 @@
 
 #include <vector>
 #include <boost/shared_ptr.hpp>
+#include <boost/noncopyable.hpp>
 
 #include <sigc++/signal.h>
 
+#include "pbd/signals.h"
+
 #include "time_selection.h"
 #include "region_selection.h"
 #include "track_selection.h"
@@ -40,6 +43,9 @@ class RegionView;
 class Selectable;
 class PublicEditor;
 class MidiRegionView;
+class AutomationLine;
+class ControlPoint;
+
 
 namespace ARDOUR {
 	class Region;
@@ -57,7 +63,7 @@ namespace Evoral {
 
 /** The Selection class holds lists of selected items (tracks, regions, etc. etc.). */
 
-class Selection : public sigc::trackable
+class Selection : public sigc::trackable, public PBD::ScopedConnectionList
 {
   public:
 	enum SelectionType {
@@ -80,13 +86,13 @@ class Selection : public sigc::trackable
 	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) : editor (e), next_time_id (0) {
-		clear();
-	}
+	Selection (PublicEditor const * e);
 
-	Selection& operator= (const Selection& other);
+	// Selection& operator= (const Selection& other);
 
 	sigc::signal<void> RegionsChanged;
 	sigc::signal<void> TracksChanged;
@@ -107,67 +113,73 @@ class Selection : public sigc::trackable
 	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 std::list<TimeAxisView*>&);
+	void set (const TrackViewList&);
 	void set (const MidiNoteSelection&);
 	void set (RegionView*, bool also_clear_tracks = true);
 	void set (MidiRegionView*);
 	void set (std::vector<RegionView*>&);
-	long set (TimeAxisView*, 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&);
 
 	void toggle (TimeAxisView*);
-	void toggle (const std::list<TimeAxisView*>&);
+	void toggle (const TrackViewList&);
 	void toggle (const MidiNoteSelection&);
 	void toggle (RegionView*);
 	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*);
-	void add (const std::list<TimeAxisView*>&);
+	void add (const TrackViewList&);
 	void add (const MidiNoteSelection&);
 	void add (RegionView*);
 	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&);
 	void remove (TimeAxisView*);
-	void remove (const std::list<TimeAxisView*>&);
+	void remove (const TrackViewList&);
 	void remove (const MidiNoteSelection&);
 	void remove (RegionView*);
 	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 ();
@@ -184,11 +196,14 @@ class Selection : public sigc::trackable
 	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);