X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fregion_selection.h;h=c4ad44da37e700ebdb217d06ba25c01a44bd98cd;hb=c2c224727eee4c16bd64ca4a5b5bb2d276f5afe3;hp=2192442cb0cbdf5ac0eb53435f1af27c5fdd3716;hpb=60454cc8dc1ca5e1819b853b55916d52497d495c;p=ardour.git

diff --git a/gtk2_ardour/region_selection.h b/gtk2_ardour/region_selection.h
index 2192442cb0..c4ad44da37 100644
--- a/gtk2_ardour/region_selection.h
+++ b/gtk2_ardour/region_selection.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2006 Paul Davis 
+    Copyright (C) 2006 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -21,19 +21,16 @@
 
 #include <set>
 #include <list>
-#include <sigc++/signal.h>
-#include <ardour/types.h>
 
-using std::list;
-using std::set;
+#include "pbd/signals.h"
+#include "ardour/types.h"
 
 class RegionView;
+class TimeAxisView;
 
-struct RegionComparator {
-    bool operator() (const RegionView* a, const RegionView* b) const;
-};
-
-class RegionSelection : public set<RegionView*, RegionComparator>, public sigc::trackable
+/** Class to represent list of selected regions.
+ */
+class RegionSelection : public std::list<RegionView*>
 {
   public:
 	RegionSelection();
@@ -41,34 +38,39 @@ class RegionSelection : public set<RegionView*, RegionComparator>, public sigc::
 
 	RegionSelection& operator= (const RegionSelection&);
 
-	void add (RegionView*, bool dosort = true);
+	bool add (RegionView*);
 	bool remove (RegionView*);
-	bool contains (RegionView*);
+	void sort_by_position_and_track ();
+
+	bool contains (RegionView*) const;
+	bool involves (const TimeAxisView&) const;
 
 	void clear_all();
-	
-	jack_nframes_t start () const {
+
+	nframes_t start () const {
 		return _current_start;
 	}
 
-	/* collides with list<>::end */
+	/* "end" collides with list<>::end */
 
-	jack_nframes_t end_frame () const { 
+	nframes_t end_frame () const {
 		return _current_end;
 	}
 
-	const list<RegionView *> & by_layer() const { return _bylayer; }
-	void  by_position (list<RegionView*>&) const;
-	
+	const std::list<RegionView *>& by_layer() const { return _bylayer; }
+	void  by_position (std::list<RegionView*>&) const;
+	void  by_track (std::list<RegionView*>&) const;
+
   private:
 	void remove_it (RegionView*);
 
 	void add_to_layer (RegionView *);
-	
-	jack_nframes_t _current_start;
-	jack_nframes_t _current_end;
 
-	list<RegionView *> _bylayer;
+	nframes_t _current_start; ///< start position for the selection
+	nframes_t _current_end; ///< end position for the selection
+
+	std::list<RegionView *> _bylayer; ///< list of regions sorted by layer
+	PBD::ScopedConnection death_connection;
 };
 
 #endif /* __ardour_gtk_region_selection_h__ */