X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fselection.h;h=c28b42a4439f0617a091fa5dcdd9cbb1fc2c4399;hb=5e7c7e52bd482dbdf8629b284781543975672766;hp=73acaaa7c00d364ace36d28ffeb4b858416e4ad5;hpb=b43875dd27f9a16ed277d5f87fb6007c367001c9;p=ardour.git

diff --git a/gtk2_ardour/selection.h b/gtk2_ardour/selection.h
index 73acaaa7c0..c28b42a443 100644
--- a/gtk2_ardour/selection.h
+++ b/gtk2_ardour/selection.h
@@ -113,7 +113,7 @@ class Selection : public sigc::trackable, public PBD::ScopedConnectionList
 
 	bool selected (TimeAxisView*);
 	bool selected (RegionView*);
-	bool selected (Marker*);
+	bool selected (ArdourMarker*);
 	bool selected (ControlPoint*);
 
 	void set (std::list<Selectable*> const &);
@@ -132,7 +132,7 @@ class Selection : public sigc::trackable, public PBD::ScopedConnectionList
 	void set (boost::shared_ptr<ARDOUR::Playlist>);
 	void set (const std::list<boost::shared_ptr<ARDOUR::Playlist> >&);
 	void set (ControlPoint *);
-	void set (Marker*);
+	void set (ArdourMarker*);
 	void set (const RegionSelection&);
 
 	void toggle (TimeAxisView*);
@@ -148,7 +148,7 @@ class Selection : public sigc::trackable, public PBD::ScopedConnectionList
 	void toggle (const std::list<boost::shared_ptr<ARDOUR::Playlist> >&);
 	void toggle (ControlPoint *);
 	void toggle (std::vector<ControlPoint*> const &);
-	void toggle (Marker*);
+	void toggle (ArdourMarker*);
 
 	void add (TimeAxisView*);
 	void add (const TrackViewList&);
@@ -163,8 +163,8 @@ class Selection : public sigc::trackable, public PBD::ScopedConnectionList
 	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 (ArdourMarker*);
+	void add (const std::list<ArdourMarker*>&);
 	void add (const RegionSelection&);
 	void add (const PointSelection&);
 	void remove (TimeAxisView*);
@@ -179,11 +179,13 @@ class Selection : public sigc::trackable, public PBD::ScopedConnectionList
 	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 remove (ArdourMarker*);
 	void remove (ControlPoint *);
 
 	void remove_regions (TimeAxisView *);
 
+        void move_time (framecnt_t);
+
 	void replace (uint32_t time_index, framepos_t start, framepos_t end);
 
 /*
@@ -196,6 +198,8 @@ class Selection : public sigc::trackable, public PBD::ScopedConnectionList
  * The Track selection isn't affected when ranges or objects are added.
  */
 
+	void clear_all() { clear_time(); clear_tracks(); clear_objects(); }
+
 	void clear_time();  //clears any time selection  ( i.e. Range )
 	void clear_tracks ();  //clears the track header selections
 	void clear_objects();  //clears the items listed below
@@ -217,6 +221,10 @@ class Selection : public sigc::trackable, public PBD::ScopedConnectionList
 	XMLNode& get_state () const;
 	int set_state (XMLNode const &, int);
 
+	PBD::Signal0<void> ClearMidiNoteSelection;
+
+	std::list<std::pair<PBD::ID const, std::list<boost::shared_ptr<Evoral::Note<Evoral::Beats> > > > > pending_midi_note_selection;
+
   private:
 	PublicEditor const * editor;
 	uint32_t next_time_id;