X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fselection.cc;h=3f6c282d3afbfd6f018fc7e721e670baa7af200c;hb=beb3eea62bf217d0a7b2a86a96d5c375329df10a;hp=f0037588a0f4aec936e2c0ca596527c1f751515a;hpb=3f38e6b7f56ad85891d3669e0f1c58e6124b07f6;p=ardour.git

diff --git a/gtk2_ardour/selection.cc b/gtk2_ardour/selection.cc
index f0037588a0..3f6c282d3a 100644
--- a/gtk2_ardour/selection.cc
+++ b/gtk2_ardour/selection.cc
@@ -143,6 +143,15 @@ Selection::clear_lines ()
 	}
 }
 
+void
+Selection::clear_markers ()
+{
+	if (!markers.empty()) {
+		markers.clear ();
+		MarkersChanged();
+	}
+}
+
 void
 Selection::toggle (boost::shared_ptr<Playlist> pl)
 {
@@ -287,36 +296,62 @@ Selection::add (TimeAxisView* track)
 }
 
 void
-Selection::add (RegionView* r)
+Selection::add (vector<RegionView*>& v)
 {
-	if (find (regions.begin(), regions.end(), r) == regions.end()) {
-		regions.add (r);
-		select_edit_group_regions ();
-		add (&r->get_trackview());
+	/* XXX This method or the add (const RegionSelection&) needs to go
+	 */
+
+	bool changed = false;
+	
+	for (vector<RegionView*>::iterator i = v.begin(); i != v.end(); ++i) {
+		if (find (regions.begin(), regions.end(), (*i)) == regions.end()) {
+			changed = regions.add ((*i));
+			if (Config->get_link_region_and_track_selection() && changed) {
+				add (&(*i)->get_trackview());
+			}
+		}
+	}
+
+	if (changed) {
 		RegionsChanged ();
 	}
 }
 
 void
-Selection::add (vector<RegionView*>& v)
+Selection::add (const RegionSelection& rs)
 {
-	bool changed = false;
+	/* XXX This method or the add (const vector<RegionView*>&) needs to go
+	 */
 
-	for (vector<RegionView*>::iterator i = v.begin(); i != v.end(); ++i) {
+	bool changed = false;
+	
+	for (RegionSelection::const_iterator i = rs.begin(); i != rs.end(); ++i) {
 		if (find (regions.begin(), regions.end(), (*i)) == regions.end()) {
 			changed = regions.add ((*i));
-			if (changed) {
+			if (Config->get_link_region_and_track_selection() && changed) {
 				add (&(*i)->get_trackview());
 			}
 		}
 	}
-
+	
 	if (changed) {
 		select_edit_group_regions ();
 		RegionsChanged ();
 	}
 }
 
+void
+Selection::add (RegionView* r)
+{
+	if (find (regions.begin(), regions.end(), r) == regions.end()) {
+		regions.add (r);
+		if (Config->get_link_region_and_track_selection()) {
+			add (&r->get_trackview());
+		}
+		RegionsChanged ();
+	}
+}
+
 long
 Selection::add (nframes_t start, nframes_t end)
 {
@@ -354,10 +389,17 @@ Selection::replace (uint32_t sid, nframes_t start, nframes_t end)
 }
 
 void
-Selection::add (AutomationList* ac)
+Selection::add (boost::shared_ptr<Evoral::ControlList> cl)
 {
-	if (find (lines.begin(), lines.end(), ac) == lines.end()) {
-		lines.push_back (ac);
+	boost::shared_ptr<ARDOUR::AutomationList> al
+		= boost::dynamic_pointer_cast<ARDOUR::AutomationList>(cl);
+	if (!al) {
+		warning << "Programming error: Selected list is not an ARDOUR::AutomationList" << endmsg;
+		return;
+		return;
+	}
+	if (find (lines.begin(), lines.end(), al) == lines.end()) {
+		lines.push_back (al);
 		LinesChanged();
 	}
 }
@@ -429,7 +471,7 @@ Selection::remove (RegionView* r)
 		RegionsChanged ();
 	}
 
-	if (!regions.involves (r->get_trackview())) {
+	if (Config->get_link_region_and_track_selection() && !regions.involves (r->get_trackview())) {
 		remove (&r->get_trackview());
 	}
 }
@@ -458,9 +500,9 @@ Selection::remove (nframes_t start, nframes_t end)
 }
 
 void
-Selection::remove (AutomationList *ac)
+Selection::remove (boost::shared_ptr<ARDOUR::AutomationList> ac)
 {
-	list<AutomationList*>::iterator i;
+	AutomationSelection::iterator i;
 	if ((i = find (lines.begin(), lines.end(), ac)) != lines.end()) {
 		lines.erase (i);
 		LinesChanged();
@@ -496,20 +538,32 @@ Selection::set (const list<boost::shared_ptr<Playlist> >& pllist)
 }
 
 void
-Selection::set (RegionView* r)
+Selection::set (const RegionSelection& rs)
+{
+	clear_regions();
+	regions = rs;
+	RegionsChanged(); /* EMIT SIGNAL */
+}
+
+void
+Selection::set (RegionView* r, bool also_clear_tracks)
 {
 	clear_regions ();
-	clear_tracks ();
+	if (also_clear_tracks) {
+		clear_tracks ();
+	}
 	add (r);
 }
 
 void
 Selection::set (vector<RegionView*>& v)
 {
-	clear_tracks ();
 	clear_regions ();
-	// make sure to deselect any automation selections
-	clear_points();
+	if (Config->get_link_region_and_track_selection()) {
+		clear_tracks ();
+		// make sure to deselect any automation selections
+		clear_points();
+	}
 	add (v);
 }
 
@@ -548,12 +602,18 @@ Selection::set (TimeAxisView* track, nframes_t start, nframes_t end)
 }
 
 void
-Selection::set (AutomationList *ac)
+Selection::set (boost::shared_ptr<Evoral::ControlList> ac)
 {
 	lines.clear();
 	add (ac);
 }
 
+bool
+Selection::selected (Marker* m)
+{
+	return find (markers.begin(), markers.end(), m) != markers.end();
+}
+
 bool
 Selection::selected (TimeAxisView* tv)
 {
@@ -575,7 +635,8 @@ Selection::empty ()
 		playlists.empty () && 
 		lines.empty () &&
 		time.empty () &&
-		playlists.empty ()
+		playlists.empty () &&
+		markers.empty()
 		;
 }
 
@@ -700,3 +761,77 @@ Selection::select_edit_group_regions ()
 		add (*i);
 	}
 }
+
+void
+Selection::set (Marker* m)
+{
+	clear_markers ();
+	add (m);
+}
+
+void
+Selection::toggle (Marker* m)
+{
+	MarkerSelection::iterator i;
+	
+	if ((i = find (markers.begin(), markers.end(), m)) == markers.end()) {
+		add (m);
+	} else {
+		remove (m);
+	}
+}
+
+void
+Selection::remove (Marker* m)
+{
+	MarkerSelection::iterator i;
+
+	if ((i = find (markers.begin(), markers.end(), m)) != markers.end()) {
+		markers.erase (i);
+		MarkersChanged();
+	}
+}
+
+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 (bind (mem_fun (*this, pmf), m));
+
+		markers.push_back (m);
+		MarkersChanged();
+	}
+}
+
+void
+Selection::add (const list<Marker*>& m)
+{
+	markers.insert (markers.end(), m.begin(), m.end());
+	MarkersChanged ();
+}
+
+void
+MarkerSelection::range (nframes64_t& s, nframes64_t& e)
+{
+	s = max_frames;
+	e = 0;
+
+	for (MarkerSelection::iterator i = begin(); i != end(); ++i) {
+
+		if ((*i)->position() < s) {
+			s = (*i)->position();
+		} 
+
+		if ((*i)->position() > e) {
+			e = (*i)->position();
+		}
+	}
+
+	s = std::min (s, e);
+	e = std::max (s, e);
+}