X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fselection.cc;h=abb49b7daf0c895bf38885068b83bf8f61fc094b;hb=57c1b6e261076cae9b61e74aa0aff47a9f296c0f;hp=6465bb4d44592d1ecd2748c71bdf6d9ddddc7bd7;hpb=23e7cf10191270d70357ccf0ed9294f020c7b7ab;p=ardour.git

diff --git a/gtk2_ardour/selection.cc b/gtk2_ardour/selection.cc
index 6465bb4d44..abb49b7daf 100644
--- a/gtk2_ardour/selection.cc
+++ b/gtk2_ardour/selection.cc
@@ -160,9 +160,6 @@ Selection::clear_regions ()
 	if (!regions.empty()) {
 		regions.clear_all ();
 		RegionsChanged();
-		if (Config->get_link_region_and_track_selection()) {
-			clear_tracks ();
-		}
 	}
 }
 
@@ -226,6 +223,7 @@ void
 Selection::toggle (boost::shared_ptr<Playlist> pl)
 {
 	clear_time();  //enforce object/range exclusivity
+	clear_tracks();  //enforce object/track exclusivity
 	
 	PlaylistSelection::iterator i;
 
@@ -269,6 +267,7 @@ void
 Selection::toggle (const MidiNoteSelection& midi_note_list)
 {
 	clear_time();  //enforce object/range exclusivity
+	clear_tracks();  //enforce object/track exclusivity
 
 	for (MidiNoteSelection::const_iterator i = midi_note_list.begin(); i != midi_note_list.end(); ++i) {
 		toggle ((*i));
@@ -296,6 +295,7 @@ void
 Selection::toggle (RegionView* r)
 {
 	clear_time();  //enforce object/range exclusivity
+	clear_tracks();  //enforce object/track exclusivity
 	
 	RegionSelection::iterator i;
 
@@ -312,6 +312,7 @@ void
 Selection::toggle (MidiRegionView* mrv)
 {
 	clear_time();   //enforce object/range exclusivity
+	clear_tracks();  //enforce object/track exclusivity
 
 	MidiRegionSelection::iterator i;
 
@@ -328,6 +329,7 @@ void
 Selection::toggle (vector<RegionView*>& r)
 {
 	clear_time();  //enforce object/range exclusivity
+	clear_tracks();  //enforce object/track exclusivity
 
 	RegionSelection::iterator i;
 
@@ -364,6 +366,7 @@ void
 Selection::add (boost::shared_ptr<Playlist> pl)
 {
 	clear_time();  //enforce object/range exclusivity
+	clear_tracks();  //enforce object/track exclusivity
 	
 	if (find (playlists.begin(), playlists.end(), pl) == playlists.end()) {
 		pl->use ();
@@ -376,6 +379,7 @@ void
 Selection::add (const list<boost::shared_ptr<Playlist> >& pllist)
 {
 	clear_time();  //enforce object/range exclusivity
+	clear_tracks();  //enforce object/track exclusivity
 	
 	bool changed = false;
 
@@ -395,6 +399,8 @@ Selection::add (const list<boost::shared_ptr<Playlist> >& pllist)
 void
 Selection::add (const TrackViewList& track_list)
 {
+	clear_objects();  //enforce object/range exclusivity
+
 	TrackViewList added = tracks.add (track_list);
 
 	if (!added.empty()) {
@@ -410,6 +416,8 @@ Selection::add (const TrackViewList& track_list)
 void
 Selection::add (TimeAxisView* track)
 {
+	clear_objects();  //enforce object/range exclusivity
+
 	TrackViewList tr;
 	track->set_selected (true);
 	tr.push_back (track);
@@ -420,6 +428,7 @@ void
 Selection::add (const MidiNoteSelection& midi_list)
 {
 	clear_time();  //enforce object/range exclusivity
+	clear_tracks();  //enforce object/track exclusivity
 
 	const MidiNoteSelection::const_iterator b = midi_list.begin();
 	const MidiNoteSelection::const_iterator e = midi_list.end();
@@ -445,6 +454,7 @@ void
 Selection::add (vector<RegionView*>& v)
 {
 	clear_time();  //enforce object/range exclusivity
+	clear_tracks();  //enforce object/track exclusivity
 
 	/* XXX This method or the add (const RegionSelection&) needs to go
 	 */
@@ -454,9 +464,6 @@ Selection::add (vector<RegionView*>& v)
 	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_time_axis_view());
-			}
 		}
 	}
 
@@ -469,6 +476,7 @@ void
 Selection::add (const RegionSelection& rs)
 {
 	clear_time();  //enforce object/range exclusivity
+	clear_tracks();  //enforce object/track exclusivity
 
 	/* XXX This method or the add (const vector<RegionView*>&) needs to go
 	 */
@@ -478,9 +486,6 @@ Selection::add (const RegionSelection& rs)
 	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 (Config->get_link_region_and_track_selection() && changed) {
-				add (&(*i)->get_time_axis_view());
-			}
 		}
 	}
 
@@ -493,15 +498,13 @@ void
 Selection::add (RegionView* r)
 {
 	clear_time();  //enforce object/range exclusivity
+	clear_tracks();  //enforce object/track exclusivity
 
 	if (find (regions.begin(), regions.end(), r) == regions.end()) {
 		bool changed = regions.add (r);
-                if (Config->get_link_region_and_track_selection() && changed) {
-                        add (&r->get_time_axis_view());
-                }
-                if (changed) {
-                        RegionsChanged ();
-                }
+        if (changed) {
+            RegionsChanged ();
+        }
 	}
 }
 
@@ -509,15 +512,11 @@ void
 Selection::add (MidiRegionView* mrv)
 {
 	clear_time();  //enforce object/range exclusivity
+	clear_tracks();  //enforce object/track exclusivity
 
 	if (find (midi_regions.begin(), midi_regions.end(), mrv) == midi_regions.end()) {
 		midi_regions.push_back (mrv);
 		/* XXX should we do this? */
-#if 0
-		if (Config->get_link_region_and_track_selection()) {
-			add (&mrv->get_time_axis_view());
-		}
-#endif
 		MidiRegionsChanged ();
 	}
 }
@@ -581,6 +580,7 @@ void
 Selection::add (boost::shared_ptr<Evoral::ControlList> cl)
 {
 	clear_time();  //enforce object/range exclusivity
+	clear_tracks();  //enforce object/track exclusivity
 
 	boost::shared_ptr<ARDOUR::AutomationList> al
 		= boost::dynamic_pointer_cast<ARDOUR::AutomationList>(cl);
@@ -707,10 +707,6 @@ Selection::remove (RegionView* r)
 	if (regions.remove (r)) {
 		RegionsChanged ();
 	}
-
-	if (Config->get_link_region_and_track_selection() && !regions.involves (r->get_time_axis_view())) {
-		remove (&r->get_time_axis_view());
-	}
 }
 
 void
@@ -722,13 +718,6 @@ Selection::remove (MidiRegionView* mrv)
 		midi_regions.erase (x);
 		MidiRegionsChanged ();
 	}
-
-#if 0
-	/* XXX fix this up ? */
-	if (Config->get_link_region_and_track_selection() && !regions.involves (r->get_time_axis_view())) {
-		remove (&r->get_time_axis_view());
-	}
-#endif
 }
 
 
@@ -767,6 +756,7 @@ Selection::remove (boost::shared_ptr<ARDOUR::AutomationList> ac)
 void
 Selection::set (TimeAxisView* track)
 {
+	clear_objects();  //enforce object/range exclusivity
 	clear_tracks ();
 	add (track);
 }
@@ -774,6 +764,7 @@ Selection::set (TimeAxisView* track)
 void
 Selection::set (const TrackViewList& track_list)
 {
+	clear_objects();  //enforce object/range exclusivity
 	clear_tracks ();
 	add (track_list);
 }
@@ -782,6 +773,7 @@ void
 Selection::set (const MidiNoteSelection& midi_list)
 {
 	clear_time ();  //enforce region/object exclusivity
+	clear_tracks();  //enforce object/track exclusivity
 	clear_objects ();
 	add (midi_list);
 }
@@ -790,6 +782,7 @@ void
 Selection::set (boost::shared_ptr<Playlist> playlist)
 {
 	clear_time ();  //enforce region/object exclusivity
+	clear_tracks();  //enforce object/track exclusivity
 	clear_objects ();
 	add (playlist);
 }
@@ -806,6 +799,7 @@ void
 Selection::set (const RegionSelection& rs)
 {
 	clear_time();  //enforce region/object exclusivity
+	clear_tracks();  //enforce object/track exclusivity
 	clear_objects();
 	regions = rs;
 	RegionsChanged(); /* EMIT SIGNAL */
@@ -815,44 +809,27 @@ void
 Selection::set (MidiRegionView* mrv)
 {
 	clear_time();  //enforce region/object exclusivity
+	clear_tracks();  //enforce object/track exclusivity
 	clear_objects ();
 	add (mrv);
 }
 
 void
-Selection::set (RegionView* r, bool also_clear_tracks)
+Selection::set (RegionView* r, bool /*also_clear_tracks*/)
 {
 	clear_time();  //enforce region/object exclusivity
+	clear_tracks();  //enforce object/track exclusivity
 	clear_objects ();
-	if (also_clear_tracks && !Config->get_link_region_and_track_selection()) {
-		/* clear_regions() will have done this if the link preference
-		 * is enabled
-		 */
-		clear_tracks ();
-	}
 	add (r);
 }
 
 void
 Selection::set (vector<RegionView*>& v)
 {
-	bool had_regions = !regions.empty();
-
 	clear_time();  //enforce region/object exclusivity
+	clear_tracks();  //enforce object/track exclusivity
 	clear_objects();
 
-	if (Config->get_link_region_and_track_selection()) {
-		if (had_regions) {
-			/* there were regions before, so we're changing the
-			 * region selection (likely), thus link region/track
-			 * selection. relevant tracks will get selected
-			 * as we ::add() below.
-			 */
-			clear_tracks ();
-			// make sure to deselect any automation selections
-			clear_points();
-		}
-	}
 	add (v);
 }
 
@@ -922,6 +899,7 @@ void
 Selection::set (boost::shared_ptr<Evoral::ControlList> ac)
 {
 	clear_time();  //enforce region/object exclusivity
+	clear_tracks();  //enforce object/track exclusivity
 	clear_objects();
 	
 	add (ac);
@@ -973,13 +951,14 @@ Selection::empty (bool internal_selection)
 	   as a cut buffer.
 	*/
 
-	return object_level_empty && midi_notes.empty();
+	return object_level_empty && midi_notes.empty() && points.empty();
 }
 
 void
 Selection::toggle (ControlPoint* cp)
 {
 	clear_time();  //enforce region/object exclusivity
+	clear_tracks();  //enforce object/track exclusivity
 
 	cp->set_selected (!cp->get_selected ());
 	PointSelection::iterator i = find (points.begin(), points.end(), cp);
@@ -996,6 +975,7 @@ void
 Selection::toggle (vector<ControlPoint*> const & cps)
 {
 	clear_time();  //enforce region/object exclusivity
+	clear_tracks();  //enforce object/track exclusivity
 
 	for (vector<ControlPoint*>::const_iterator i = cps.begin(); i != cps.end(); ++i) {
 		toggle (*i);
@@ -1006,6 +986,7 @@ void
 Selection::toggle (list<Selectable*> const & selectables)
 {
 	clear_time();  //enforce region/object exclusivity
+	clear_tracks();  //enforce object/track exclusivity
 	
 	RegionView* rv;
 	ControlPoint* cp;
@@ -1021,7 +1002,7 @@ Selection::toggle (list<Selectable*> const & selectables)
 			fatal << _("programming error: ")
 			      << X_("unknown selectable type passed to Selection::toggle()")
 			      << endmsg;
-			/*NOTREACHED*/
+			abort(); /*NOTREACHED*/
 		}
 	}
 
@@ -1038,12 +1019,9 @@ void
 Selection::set (list<Selectable*> const & selectables)
 {
 	clear_time ();  //enforce region/object exclusivity
+	clear_tracks();  //enforce object/track exclusivity
 	clear_objects ();
 
-	if (Config->get_link_region_and_track_selection ()) {
-		clear_tracks ();
-	}
-
 	add (selectables);
 }
 
@@ -1051,6 +1029,7 @@ void
 Selection::add (PointSelection const & s)
 {
 	clear_time ();  //enforce region/object exclusivity
+	clear_tracks();  //enforce object/track exclusivity
 
 	for (PointSelection::const_iterator i = s.begin(); i != s.end(); ++i) {
 		points.push_back (*i);
@@ -1061,6 +1040,7 @@ void
 Selection::add (list<Selectable*> const & selectables)
 {
 	clear_time ();  //enforce region/object exclusivity
+	clear_tracks();  //enforce object/track exclusivity
 
 	RegionView* rv;
 	ControlPoint* cp;
@@ -1076,7 +1056,7 @@ Selection::add (list<Selectable*> const & selectables)
 			fatal << _("programming error: ")
 			      << X_("unknown selectable type passed to Selection::add()")
 			      << endmsg;
-			/*NOTREACHED*/
+			abort(); /*NOTREACHED*/
 		}
 	}
 
@@ -1102,6 +1082,7 @@ void
 Selection::add (ControlPoint* cp)
 {
 	clear_time ();  //enforce region/object exclusivity
+	clear_tracks();  //enforce object/track exclusivity
 
 	cp->set_selected (true);
 	points.push_back (cp);
@@ -1112,6 +1093,7 @@ void
 Selection::add (vector<ControlPoint*> const & cps)
 {
 	clear_time ();  //enforce region/object exclusivity
+	clear_tracks();  //enforce object/track exclusivity
 
 	for (vector<ControlPoint*>::const_iterator i = cps.begin(); i != cps.end(); ++i) {
 		(*i)->set_selected (true);
@@ -1124,6 +1106,7 @@ void
 Selection::set (ControlPoint* cp)
 {
 	clear_time ();  //enforce region/object exclusivity
+	clear_tracks();  //enforce object/track exclusivity
 
 	if (cp->get_selected()) {
 		return;
@@ -1141,6 +1124,7 @@ void
 Selection::set (Marker* m)
 {
 	clear_time ();  //enforce region/object exclusivity
+	clear_tracks();  //enforce object/track exclusivity
 	markers.clear ();
 
 	add (m);
@@ -1173,6 +1157,7 @@ void
 Selection::add (Marker* m)
 {
 	clear_time ();  //enforce region/object exclusivity
+	clear_tracks();  //enforce object/track exclusivity
 
 	if (find (markers.begin(), markers.end(), m) == markers.end()) {
 		markers.push_back (m);
@@ -1184,6 +1169,7 @@ void
 Selection::add (const list<Marker*>& m)
 {
 	clear_time ();  //enforce region/object exclusivity
+	clear_tracks();  //enforce object/track exclusivity
 
 	markers.insert (markers.end(), m.begin(), m.end());
 	markers.sort ();