X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fregion_selection.h;h=5c05a813f9464127ad7ee5560a21fb4cb2c867d2;hb=76c25a4a4459b8e550c3c687458d04db0beaee77;hp=0c2b7be0255d73e42a807f834098c3099925735e;hpb=e493b2b7c4fbbbfc457f02babf9546289b430177;p=ardour.git

diff --git a/gtk2_ardour/region_selection.h b/gtk2_ardour/region_selection.h
index 0c2b7be025..5c05a813f9 100644
--- a/gtk2_ardour/region_selection.h
+++ b/gtk2_ardour/region_selection.h
@@ -1,3 +1,21 @@
+/*
+    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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
 #ifndef __ardour_gtk_region_selection_h__
 #define __ardour_gtk_region_selection_h__
 
@@ -9,48 +27,46 @@
 using std::list;
 using std::set;
 
-class AudioRegionView;
-
-struct AudioRegionComparator {
-    bool operator() (const AudioRegionView* a, const AudioRegionView* b) const;
-};
+class RegionView;
 
-class AudioRegionSelection : public set<AudioRegionView*, AudioRegionComparator>, public sigc::trackable
+class RegionSelection : public std::list<RegionView*>, public sigc::trackable
 {
   public:
-        AudioRegionSelection();
-	AudioRegionSelection (const AudioRegionSelection&);
+	RegionSelection();
+	RegionSelection (const RegionSelection&);
 
-	AudioRegionSelection& operator= (const AudioRegionSelection&);
+	RegionSelection& operator= (const RegionSelection&);
 
-	void add (AudioRegionView*, bool dosort = true);
-	bool remove (AudioRegionView*);
-	bool contains (AudioRegionView*);
+	void add (RegionView*);
+	bool remove (RegionView*);
+	bool contains (RegionView*);
+	void sort_by_position_and_track ();
 
 	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<AudioRegionView *> & by_layer() const { return _bylayer; }
-	void  by_position (list<AudioRegionView*>&) 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 (AudioRegionView*);
+	void remove_it (RegionView*);
 
-	void add_to_layer (AudioRegionView *);
+	void add_to_layer (RegionView *);
 	
-	jack_nframes_t _current_start;
-	jack_nframes_t _current_end;
+	nframes_t _current_start;
+	nframes_t _current_end;
 
-	list<AudioRegionView *> _bylayer;
+	list<RegionView *> _bylayer;
 };
 
 #endif /* __ardour_gtk_region_selection_h__ */