X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_selection.cc;h=e19afe375cea48a7057770538922d3f63be12892;hb=da1e8701eb90f7e11c74e0104a5f97bf227aa2bd;hp=ffce8af25fd7fc144bddb7724e4d95079343a98a;hpb=adbb47fae78324837b146258ae065c64a8403f40;p=ardour.git

diff --git a/gtk2_ardour/editor_selection.cc b/gtk2_ardour/editor_selection.cc
index ffce8af25f..e19afe375c 100644
--- a/gtk2_ardour/editor_selection.cc
+++ b/gtk2_ardour/editor_selection.cc
@@ -880,7 +880,7 @@ Editor::set_selected_regionview_from_region_list (boost::shared_ptr<Region> regi
 {
 	vector<RegionView*> all_equivalent_regions;
 
-	get_regions_corresponding_to (region, all_equivalent_regions);
+	get_regions_corresponding_to (region, all_equivalent_regions, region->whole_file());
 
 	if (all_equivalent_regions.empty()) {
 		return;
@@ -962,9 +962,7 @@ Editor::track_selection_changed ()
 			(*j)->set_selected (find (selection->tracks.begin(), selection->tracks.end(), j->get()) != selection->tracks.end());
 		}
 
-		if (yn &&
-		    ((mouse_mode == MouseRange) ||
-		     ((mouse_mode == MouseObject) && (_join_object_range_state == JOIN_OBJECT_RANGE_OBJECT)))) {
+		if (yn) {
 			(*i)->reshow_selection (selection->time);
 		} else {
 			(*i)->hide_selection ();
@@ -1049,6 +1047,8 @@ Editor::sensitize_the_right_region_actions ()
 	bool have_midi = false;
 	bool have_locked = false;
 	bool have_unlocked = false;
+	bool have_video_locked = false;
+	bool have_video_unlocked = false;
 	bool have_position_lock_style_audio = false;
 	bool have_position_lock_style_music = false;
 	bool have_muted = false;
@@ -1091,6 +1091,12 @@ Editor::sensitize_the_right_region_actions ()
 			have_unlocked = true;
 		}
 
+		if (r->video_locked()) {
+			have_video_locked = true;
+		} else {
+			have_video_unlocked = true;
+		}
+
 		if (r->position_lock_style() == MusicTime) {
 			have_position_lock_style_music = true;
 		} else {
@@ -1143,6 +1149,9 @@ Editor::sensitize_the_right_region_actions ()
 		_region_actions->get_action("show-region-properties")->set_sensitive (false);
 		_region_actions->get_action("rename-region")->set_sensitive (false);
 		if (have_audio) {
+			/* XXX need to check whether there is than 1 per
+			   playlist, because otherwise this makes no sense.
+			*/
 			_region_actions->get_action("combine-regions")->set_sensitive (true);
 		} else {
 			_region_actions->get_action("combine-regions")->set_sensitive (false);
@@ -1211,6 +1220,12 @@ Editor::sensitize_the_right_region_actions ()
 		// a->set_inconsistent ();
 	}
 
+	a = Glib::RefPtr<ToggleAction>::cast_dynamic (_region_actions->get_action("toggle-region-video-lock"));
+	a->set_active (have_video_locked && !have_video_unlocked);
+	if (have_video_locked && have_video_unlocked) {
+		// a->set_inconsistent ();
+	}
+
 	a = Glib::RefPtr<ToggleAction>::cast_dynamic (_region_actions->get_action("toggle-region-lock-style"));
 	a->set_active (have_position_lock_style_music && !have_position_lock_style_audio);
 
@@ -1298,8 +1313,8 @@ Editor::region_selection_changed ()
 		sensitize_all_region_actions (true);
 	}
 
-	if (_session && Config->get_always_play_range() && !_session->transport_rolling() && !selection->regions.empty()) {
-		_session->request_locate (selection->regions.start());
+	if (_session && !_session->transport_rolling() && !selection->regions.empty()) {
+		maybe_locate_with_edit_preroll (selection->regions.start());
 	}
 }
 
@@ -1801,7 +1816,7 @@ Editor::select_range_between ()
 	framepos_t start;
 	framepos_t end;
 
-	if (mouse_mode == MouseRange && !selection->time.empty()) {
+	if ( !selection->time.empty() ) {
 		selection->clear_time ();
 	}
 
@@ -1819,9 +1834,9 @@ Editor::get_edit_op_range (framepos_t& start, framepos_t& end) const
 	framepos_t m;
 	bool ignored;
 
-	/* in range mode, use any existing selection */
+	/* if an explicit range exists, use it */
 
-	if (mouse_mode == MouseRange && !selection->time.empty()) {
+	if (!selection->time.empty()) {
 		/* we know that these are ordered */
 		start = selection->time.start();
 		end = selection->time.end_frame();