X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_ops.cc;h=55382bbacaed10f2821ad28e01364dbb72248ad4;hb=162c48b84381335ff90fe64b5324467693dee736;hp=0570a436481891c2deb17a11939a44aa31a94c95;hpb=a3f7f86d9b8cee4183e9da6c2f8f6cfd4ee26969;p=ardour.git

diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index 0570a43648..55382bbaca 100644
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -198,7 +198,7 @@ Editor::split_regions_at (nframes64_t where, RegionSelection& regions)
 }
 
 boost::shared_ptr<Region>
-Editor::select_region_for_operation (int dir, TimeAxisView **tv)
+Editor::select_region_for_operation (int /*dir*/, TimeAxisView **tv)
 {
 	RegionView* rv;
 	boost::shared_ptr<Region> region;
@@ -1800,7 +1800,7 @@ Editor::temporal_zoom_session ()
 }
 
 void
-Editor::temporal_zoom_by_frame (nframes64_t start, nframes64_t end, const string & op)
+Editor::temporal_zoom_by_frame (nframes64_t start, nframes64_t end, const string & /*op*/)
 {
 	if (!session) return;
 
@@ -2693,9 +2693,11 @@ Editor::region_from_selection ()
 	nframes64_t start = selection->time[clicked_selection].start;
 	nframes64_t end = selection->time[clicked_selection].end;
 
+	TrackSelection tracks = get_tracks_for_range_action ();
+
 	nframes64_t selection_cnt = end - start + 1;
 	
-	for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) {
+	for (TrackSelection::iterator i = tracks.begin(); i != tracks.end(); ++i) {
 		boost::shared_ptr<Region> current;
 		boost::shared_ptr<Playlist> pl;
 		nframes64_t internal_start;
@@ -2786,41 +2788,52 @@ add_if_covered (RegionView* rv, const AudioRange* ar, RegionSelection* rs)
 	}
 }
 
-void
-Editor::separate_regions_between (const TimeSelection& ts)
+/** Return either:
+ *    - selected tracks, or if there are none...
+ *    - tracks containing selected regions, or if there are none...
+ *    - all tracks
+ * @return tracks.
+ */
+TrackSelection
+Editor::get_tracks_for_range_action () const
 {
-	bool in_command = false;
-	boost::shared_ptr<Playlist> playlist;
-	RegionSelection new_selection;
-	TrackSelection tmptracks;
-
+	TrackSelection t;
+	
 	if (selection->tracks.empty()) {
 		
 		/* use tracks with selected regions */
 
-		RegionSelection rs; 
-
-		get_regions_for_action (rs);
+		RegionSelection rs = selection->regions;
 
 		for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) {
 			TimeAxisView* tv = &(*i)->get_time_axis_view();
 
-			if (find (tmptracks.begin(), tmptracks.end(), tv) == tmptracks.end()) {
-				tmptracks.push_back (tv);
+			if (!t.contains (tv)) {
+				t.push_back (tv);
 			}
 		}
 
-		if (tmptracks.empty()) {
-			/* no regions selected: do nothing */
-			return;
+		if (t.empty()) {
+			/* no regions and no tracks: use all tracks */
+			t = track_views;
 		}
 
 	} else {
 
-		tmptracks = selection->tracks;
-
+		t = selection->tracks;
 	}
 
+	return t;
+}
+
+void
+Editor::separate_regions_between (const TimeSelection& ts)
+{
+	bool in_command = false;
+	boost::shared_ptr<Playlist> playlist;
+	RegionSelection new_selection;
+
+	TrackSelection tmptracks = get_tracks_for_range_action ();
 	sort_track_selection (&tmptracks);
 
 	for (TrackSelection::iterator i = tmptracks.begin(); i != tmptracks.end(); ++i) {
@@ -2895,6 +2908,10 @@ Editor::separate_regions_between (const TimeSelection& ts)
 	}
 }
 
+/** Take tracks from get_tracks_for_range_action and cut any regions
+ *  on those tracks so that the tracks are empty over the time
+ *  selection.
+ */
 void
 Editor::separate_region_from_selection ()
 {
@@ -3684,7 +3701,7 @@ Editor::freeze_thread ()
 }
 
 gint
-Editor::freeze_progress_timeout (void *arg)
+Editor::freeze_progress_timeout (void */*arg*/)
 {
 	interthread_progress_bar.set_fraction (current_interthread_info->progress);
 	return !(current_interthread_info->done || current_interthread_info->cancel);