X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fselection.h;h=aa9510beedc8258322afea80ecbdbf0058667f75;hb=5b347e92587513bfb7d6321e6bd67195db9c0ad5;hp=7585c0ae5685eb9b20a63191e09cbfd5a8d1227f;hpb=ced4378d0914bcfb926267772c45d1d23f3bed38;p=ardour.git

diff --git a/gtk2_ardour/selection.h b/gtk2_ardour/selection.h
index 7585c0ae56..aa9510beed 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,7 +179,7 @@ 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 *);
@@ -200,18 +200,18 @@ class Selection : public sigc::trackable, public PBD::ScopedConnectionList
 
 	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
+	void clear_time(bool with_signal = true);  //clears any time selection  ( i.e. Range )
+	void clear_tracks (bool with_signal = true);  //clears the track header selections
+	void clear_objects(bool with_signal = true);  //clears the items listed below
 
 	// these items get cleared wholesale in clear_objects
-	void clear_regions();
-	void clear_lines ();
-	void clear_playlists ();
-	void clear_points ();
-	void clear_markers ();
-	void clear_midi_notes ();
-	void clear_midi_regions ();
+	void clear_regions(bool with_signal = true);
+	void clear_lines (bool with_signal = true);
+	void clear_playlists (bool with_signal = true);
+	void clear_points (bool with_signal = true);
+	void clear_markers (bool with_signal = true);
+	void clear_midi_notes (bool with_signal = true);
+	void clear_midi_regions (bool with_signal = true);
 
 	void foreach_region (void (ARDOUR::Region::*method)(void));
 	void foreach_regionview (void (RegionView::*method)(void));
@@ -221,8 +221,6 @@ 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: