X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fselection.h;h=00bc6eeaaaed697fb89aef3d5e68fd70582d1266;hb=7d6db80042afbd4b092f11d58fac50c81c781eaa;hp=7b503a5e63ef0f0dca17c583e8011cf5cac5d2d6;hpb=6f4a92f740b2fd75794489ce58f9348f8adf6bf4;p=ardour.git

diff --git a/gtk2_ardour/selection.h b/gtk2_ardour/selection.h
index 7b503a5e63..00bc6eeaaa 100644
--- a/gtk2_ardour/selection.h
+++ b/gtk2_ardour/selection.h
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #ifndef __ardour_gtk_selection_h__
@@ -56,6 +55,7 @@ class Selection : public sigc::trackable
 
 	enum Operation {
 		Set,
+		Add,
 		Toggle,
 		Extend
 	};
@@ -91,51 +91,54 @@ class Selection : public sigc::trackable
 	bool selected (TimeAxisView*);
 	bool selected (RegionView*);
 
-	void set (list<Selectable*>&);
-	void add (list<Selectable*>&);
+	void set (std::list<Selectable*>&);
+	void add (std::list<Selectable*>&);
+	void toggle (std::list<Selectable*>&);
 	
 	void set (TimeAxisView*);
-	void set (const list<TimeAxisView*>&);
+	void set (const std::list<TimeAxisView*>&);
 	void set (RegionView*);
 	void set (std::vector<RegionView*>&);
-	long set (TimeAxisView*, jack_nframes_t, jack_nframes_t);
+	long set (TimeAxisView*, nframes_t, nframes_t);
 	void set (ARDOUR::AutomationList*);
-	void set (ARDOUR::Playlist*);
-	void set (const list<ARDOUR::Playlist*>&);
+	void set (boost::shared_ptr<ARDOUR::Playlist>);
+	void set (const std::list<boost::shared_ptr<ARDOUR::Playlist> >&);
 	void set (boost::shared_ptr<ARDOUR::Redirect>);
 	void set (AutomationSelectable*);
 
 	void toggle (TimeAxisView*);
-	void toggle (const list<TimeAxisView*>&);
+	void toggle (const std::list<TimeAxisView*>&);
 	void toggle (RegionView*);
 	void toggle (std::vector<RegionView*>&);
-	long toggle (jack_nframes_t, jack_nframes_t);
+	long toggle (nframes_t, nframes_t);
 	void toggle (ARDOUR::AutomationList*);
-	void toggle (ARDOUR::Playlist*);
-	void toggle (const list<ARDOUR::Playlist*>&);
+	void toggle (boost::shared_ptr<ARDOUR::Playlist>);
+	void toggle (const std::list<boost::shared_ptr<ARDOUR::Playlist> >&);
 	void toggle (boost::shared_ptr<ARDOUR::Redirect>);
+	void toggle (const std::vector<AutomationSelectable*>&);
 
 	void add (TimeAxisView*);
-	void add (const list<TimeAxisView*>&);
+	void add (const std::list<TimeAxisView*>&);
 	void add (RegionView*);
 	void add (std::vector<RegionView*>&);
-	long add (jack_nframes_t, jack_nframes_t);
+	long add (nframes_t, nframes_t);
 	void add (ARDOUR::AutomationList*);
-	void add (ARDOUR::Playlist*);
-	void add (const list<ARDOUR::Playlist*>&);
+	void add (boost::shared_ptr<ARDOUR::Playlist>);
+	void add (const std::list<boost::shared_ptr<ARDOUR::Playlist> >&);
 	void add (boost::shared_ptr<ARDOUR::Redirect>);
 	
 	void remove (TimeAxisView*);
-	void remove (const list<TimeAxisView*>&);
+	void remove (const std::list<TimeAxisView*>&);
 	void remove (RegionView*);
 	void remove (uint32_t selection_id);
-	void remove (jack_nframes_t, jack_nframes_t);
+	void remove (nframes_t, nframes_t);
 	void remove (ARDOUR::AutomationList*);
-	void remove (ARDOUR::Playlist*);
-	void remove (const list<ARDOUR::Playlist*>&);
+	void remove (boost::shared_ptr<ARDOUR::Playlist>);
+	void remove (const std::list<boost::shared_ptr<ARDOUR::Playlist> >&);
 	void remove (boost::shared_ptr<ARDOUR::Redirect>);
+	void remove (const list<Selectable*>&);
 
-	void replace (uint32_t time_index, jack_nframes_t start, jack_nframes_t end);
+	void replace (uint32_t time_index, nframes_t start, nframes_t end);
 	
 	void clear_regions();
 	void clear_tracks ();