X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fselection.cc;h=a7658ed2b9ab358e08743789bd3ebdeb83305742;hb=bbb65d07d33160366533d9f2390f3f8d56fcb8e1;hp=1a0b1305c738e1ea0e38edff5af1b9e72aa04108;hpb=034db5fb1cc4d71bfa0e1c005733115df68fdefd;p=ardour.git

diff --git a/gtk2_ardour/selection.cc b/gtk2_ardour/selection.cc
index 1a0b1305c7..a7658ed2b9 100644
--- a/gtk2_ardour/selection.cc
+++ b/gtk2_ardour/selection.cc
@@ -25,6 +25,7 @@
 #include "ardour/playlist.h"
 #include "ardour/rc_configuration.h"
 
+#include "gui_thread.h"
 #include "midi_cut_buffer.h"
 #include "region_view.h"
 #include "selection.h"
@@ -45,6 +46,23 @@ struct AudioRangeComparator {
     }
 };
 
+Selection::Selection (const PublicEditor* e)
+	: tracks (e)
+	, editor (e)
+	, next_time_id (0) 
+{
+	clear ();
+
+	/* we have disambiguate which remove() for the compiler */
+
+	void (Selection::*track_remove)(TimeAxisView*) = &Selection::remove;
+	TimeAxisView::CatchDeletion.connect (*this, ui_bind (track_remove, this, _1), gui_context());
+
+	void (Selection::*marker_remove)(Marker*) = &Selection::remove;
+	Marker::CatchDeletion.connect (*this, ui_bind (marker_remove, this, _1), gui_context());
+}	
+
+#if 0
 Selection&
 Selection::operator= (const Selection& other)
 {
@@ -58,14 +76,13 @@ Selection::operator= (const Selection& other)
 	}
 	return *this;
 }
+#endif
 
 bool
 operator== (const Selection& a, const Selection& b)
 {
 	return a.regions == b.regions &&
 		a.tracks == b.tracks &&
-		a.time.track == b.time.track &&
-		a.time.group == b.time.group &&
 		a.time == b.time &&
 		a.lines == b.lines &&
 		a.playlists == b.playlists &&
@@ -139,8 +156,6 @@ Selection::clear_midi_regions ()
 void
 Selection::clear_time ()
 {
-	time.track = 0;
-	time.group = 0;
 	time.clear();
 
 	TimeChanged ();
@@ -210,8 +225,6 @@ Selection::toggle (TimeAxisView* track)
 	TrackSelection::iterator i;
 
 	if ((i = find (tracks.begin(), tracks.end(), track)) == tracks.end()) {
-		void (Selection::*pmf)(TimeAxisView*) = &Selection::remove;
-		track->GoingAway.connect (sigc::bind (sigc::mem_fun (*this, pmf), track));
 		tracks.push_back (track);
 	} else {
 		tracks.erase (i);
@@ -338,11 +351,6 @@ Selection::add (const TrackViewList& track_list)
 {
 	TrackViewList added = tracks.add (track_list);
 
-	for (list<TimeAxisView*>::const_iterator i = added.begin(); i != added.end(); ++i) {
-		void (Selection::*pmf)(TimeAxisView*) = &Selection::remove;
-		(*i)->GoingAway.connect (sigc::bind (sigc::mem_fun (*this, pmf), (*i)));
-	}
-
 	if (!added.empty()) {
 		TracksChanged ();
 	}
@@ -729,8 +737,11 @@ Selection::set (vector<RegionView*>& v)
 	add (v);
 }
 
+/** Set the start and end time of the time selection, without changing
+ *  the list of tracks it applies to.
+ */
 long
-Selection::set (TimeAxisView* track, nframes_t start, nframes_t end)
+Selection::set (nframes_t start, nframes_t end)
 {
 	if ((start == 0 && end == 0) || end < start) {
 		return 0;
@@ -748,14 +759,6 @@ Selection::set (TimeAxisView* track, nframes_t start, nframes_t end)
 		time.front().end = end;
 	}
 
-	if (track) {
-		time.track = track;
-		time.group = track->route_group();
-	} else {
-		time.track = 0;
-		time.group = 0;
-	}
-
 	time.consolidate ();
 
 	TimeChanged ();
@@ -830,14 +833,14 @@ Selection::toggle (const vector<AutomationSelectable*>& autos)
 }
 
 void
-Selection::toggle (list<Selectable*>& selectables)
+Selection::toggle (list<Selectable*> const & selectables)
 {
 	RegionView* rv;
 	AutomationSelectable* as;
 	vector<RegionView*> rvs;
 	vector<AutomationSelectable*> autos;
 
-	for (std::list<Selectable*>::iterator i = selectables.begin(); i != selectables.end(); ++i) {
+	for (std::list<Selectable*>::const_iterator i = selectables.begin(); i != selectables.end(); ++i) {
 		if ((rv = dynamic_cast<RegionView*> (*i)) != 0) {
 			rvs.push_back (rv);
 		} else if ((as = dynamic_cast<AutomationSelectable*> (*i)) != 0) {
@@ -860,7 +863,7 @@ Selection::toggle (list<Selectable*>& selectables)
 }
 
 void
-Selection::set (list<Selectable*>& selectables)
+Selection::set (list<Selectable*> const & selectables)
 {
 	clear_regions();
 	clear_points ();
@@ -869,14 +872,14 @@ Selection::set (list<Selectable*>& selectables)
 
 
 void
-Selection::add (list<Selectable*>& selectables)
+Selection::add (list<Selectable*> const & selectables)
 {
 	RegionView* rv;
 	AutomationSelectable* as;
 	vector<RegionView*> rvs;
 	vector<AutomationSelectable*> autos;
 
-	for (std::list<Selectable*>::iterator i = selectables.begin(); i != selectables.end(); ++i) {
+	for (std::list<Selectable*>::const_iterator i = selectables.begin(); i != selectables.end(); ++i) {
 		if ((rv = dynamic_cast<RegionView*> (*i)) != 0) {
 			rvs.push_back (rv);
 		} else if ((as = dynamic_cast<AutomationSelectable*> (*i)) != 0) {
@@ -951,13 +954,6 @@ void
 Selection::add (Marker* m)
 {
 	if (find (markers.begin(), markers.end(), m) == markers.end()) {
-
-		/* disambiguate which remove() for the compiler */
-
-		void (Selection::*pmf)(Marker*) = &Selection::remove;
-
-		m->GoingAway.connect (sigc::bind (sigc::mem_fun (*this, pmf), m));
-
 		markers.push_back (m);
 		MarkersChanged();
 	}