X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fregion_selection.h;h=fd43e4626fa648689137a88bcf92b5dd4463d7fb;hb=40e2a6b16b47acf1f19a31f5e6d1cd463c45e1b6;hp=ee0cdab008258f5ff9679a8d7748c8560f30d470;hpb=eeae6aec340d74eba7f5d00e450cbe47afcf0ec0;p=ardour.git

diff --git a/gtk2_ardour/region_selection.h b/gtk2_ardour/region_selection.h
index ee0cdab008..fd43e4626f 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,18 +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;
 
 /** Class to represent list of selected regions.
  */
-class RegionSelection : public std::list<RegionView*>, public sigc::trackable
+class RegionSelection : public std::list<RegionView*>
 {
   public:
 	RegionSelection();
@@ -48,30 +46,24 @@ class RegionSelection : public std::list<RegionView*>, public sigc::trackable
 	bool involves (const TimeAxisView&) const;
 
 	void clear_all();
-	
-	nframes_t start () const {
-		return _current_start;
-	}
+
+	framepos_t start () const;
 
 	/* "end" collides with list<>::end */
 
-	nframes_t end_frame () const { 
-		return _current_end;
-	}
+	framepos_t end_frame () 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 *);
-	
-	nframes_t _current_start; ///< start position for the selection
-	nframes_t _current_end; ///< end position for the selection
 
-	list<RegionView *> _bylayer; ///< list of regions sorted by layer
+	std::list<RegionView *> _bylayer; ///< list of regions sorted by layer
+	PBD::ScopedConnection death_connection;
 };
 
 #endif /* __ardour_gtk_region_selection_h__ */