small keybinding changes; fixup play-selected-regions

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2871 d708f5d6-7413-0410-9779-e7cbd77b26cf

4 files changed, 26 insertions, 16 deletions

diff --git a/gtk2_ardour/ardour.bindings.in b/gtk2_ardour/ardour.bindings.in
index ac00846a21..990b74182b 100644
--- a/gtk2_ardour/ardour.bindings.in
+++ b/gtk2_ardour/ardour.bindings.in
@@ -5,8 +5,8 @@
 
 ;; punctuation
 
-(gtk_accel_path "<Actions>/Editor/temporal-zoom-in" "minus")
-(gtk_accel_path "<Actions>/Editor/temporal-zoom-out" "equal")
+(gtk_accel_path "<Actions>/Editor/temporal-zoom-in" "equal")
+(gtk_accel_path "<Actions>/Editor/temporal-zoom-out" "minus")
 (gtk_accel_path "<Actions>/Editor/edit-cursor-to-previous-region-sync" "apostrophe")
 (gtk_accel_path "<Actions>/Editor/edit-cursor-to-next-region-sync" "semicolon")
 (gtk_accel_path "<Actions>/Editor/cycle-edit-point" "grave")
@@ -22,6 +22,7 @@
 
 (gtk_accel_path "<Actions>/Transport/ToggleRoll" "space")
 (gtk_accel_path "<Actions>/Transport/ToggleRollForgetCapture" "<%PRIMARY%>space")
+(gtk_accel_path "<Actions>/Transport/record-roll" "<%TERTIARY%>space")
 
 (gtk_accel_path "<Actions>/Editor/set-fade-in-length" "slash")
 (gtk_accel_path "<Actions>/Editor/set-fade-out-length" "backslash")
@@ -52,6 +53,7 @@
 (gtk_accel_path "<Actions>/MouseMode/set-mouse-mode-timefx" "t")
 (gtk_accel_path "<Actions>/Editor/select-all-between-cursors" "u")
 (gtk_accel_path "<Actions>/Editor/insert-region" "i")
+(gtk_accel_path "<Actions>/Editor/invert-selection" "<%TERTIARY%>i")
 (gtk_accel_path "<Actions>/Editor/addExistingAudioFiles" "<%SECONDARY%>i")
 (gtk_accel_path "<Actions>/MouseMode/set-mouse-mode-object" "o")
 (gtk_accel_path "<Actions>/Editor/set-playhead" "p")
@@ -74,6 +76,7 @@
 
 (gtk_accel_path "<Actions>/Editor/toggle-follow-playhead" "f")
 (gtk_accel_path "<Actions>/MouseMode/set-mouse-mode-gain" "g")
+(gtk_accel_path "<Actions>/Editor/play-selected-regions" "h")
 (gtk_accel_path "<Actions>/Editor/trim-front" "j")
 (gtk_accel_path "<Actions>/Editor/trim-back" "k")
 (gtk_accel_path "<Actions>/Transport/Loop" "l")
@@ -108,9 +111,11 @@
 
 (gtk_accel_path "<Actions>/Editor/step-tracks-up" "uparrow")
 (gtk_accel_path "<Actions>/Transport/TransitionToRoll" "<%PRIMARY%>uparrow")
+(gtk_accel_path "<Actions>/Editor/select-prev-route" "<%SECONDARY%>uparrow")
 
 (gtk_accel_path "<Actions>/Editor/step-tracks-down" "downarrow")
 (gtk_accel_path "<Actions>/Transport/TransitionToReverse" "<%PRIMARY%>downarrow")
+(gtk_accel_path "<Actions>/Editor/select-next-route" "<%SECONDARY%>downarrow")
 
 (gtk_accel_path "<Actions>/Editor/scroll-backward" "leftarrow")
 (gtk_accel_path "<Actions>/Transport/Rewind" "<%PRIMARY%>leftarrow")
@@ -162,9 +167,13 @@
 
 ;; F-N keys
 
-(gtk_accel_path "<Actions>/Common/ToggleMaximalEditor" "F11")
-(gtk_accel_path "<Actions>/Editor/edit-cursor-to-range-end" "F2")
 (gtk_accel_path "<Actions>/Editor/edit-cursor-to-range-start" "F1")
+(gtk_accel_path "<Actions>/Editor/edit-cursor-to-range-end" "F2")
+(gtk_accel_path "<Actions>/Editor/crop" "F3")
+(gtk_accel_path "<Actions>/Editor/separate" "F4")
+(gtk_accel_path "<Actions>/Editor/pitch-shift-region" "F5")
+(gtk_accel_path "<Actions>/Editor/select-range-between-cursors" "F6")
+(gtk_accel_path "<Actions>/Common/ToggleMaximalEditor" "F11")
 
 ;; numbers
 
diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index edfba0f430..30670029b2 100644
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -2396,7 +2396,7 @@ Editor::play_selected_region ()
 	nframes64_t start = max_frames;
 	nframes64_t end = 0;
 
-	ensure_entered_region_selected (true);
+	ExclusiveRegionSelection esr (*this, entered_regionview);
 
 	if (selection->regions.empty()) {
 		return;
@@ -2411,6 +2411,7 @@ Editor::play_selected_region ()
 		}
 	}
 
+	session->request_stop ();
 	session->request_bounded_roll (start, end);
 }
 
diff --git a/gtk2_ardour/editor_timefx.cc b/gtk2_ardour/editor_timefx.cc
index 5b2b750746..75838eb5fc 100644
--- a/gtk2_ardour/editor_timefx.cc
+++ b/gtk2_ardour/editor_timefx.cc
@@ -90,13 +90,6 @@ Editor::TimeFXDialog::TimeFXDialog (Editor& e, bool pitch)
 	get_vbox()->set_spacing (5);
 	get_vbox()->set_border_width (12);
 
-#ifdef USE_RUBBERBAND
-	get_vbox()->pack_start (opts_box, false, false);
-#else
-	get_vbox()->pack_start (upper_button_box, false, false);
-#endif
-	get_vbox()->pack_start (progress_bar);
-
 	if (pitching) {
 
 		upper_button_box.set_spacing (5);
@@ -120,6 +113,8 @@ Editor::TimeFXDialog::TimeFXDialog (Editor& e, bool pitch)
 
 		add_button (_("Shift"), Gtk::RESPONSE_ACCEPT);
 
+		get_vbox()->pack_start (upper_button_box, false, false);
+
 	} else {
 
 #ifdef USE_RUBBERBAND
@@ -134,6 +129,9 @@ Editor::TimeFXDialog::TimeFXDialog (Editor& e, bool pitch)
 		opts_box.pack_start (precise_button, false, false);
 		opts_box.pack_start (stretch_opts_label, false, false);
 		opts_box.pack_start (stretch_opts_selector, false, false);
+
+		get_vbox()->pack_start (opts_box, false, false);
+
 #else
 		upper_button_box.set_homogeneous (true);
 		upper_button_box.set_spacing (5);
@@ -144,11 +142,15 @@ Editor::TimeFXDialog::TimeFXDialog (Editor& e, bool pitch)
 
 		quick_button.set_name (N_("TimeFXButton"));
 		antialias_button.set_name (N_("TimeFXButton"));
-#endif	
 
+		get_vbox()->pack_start (upper_button_box, false, false);
+
+#endif	
 		add_button (_("Stretch/Shrink"), Gtk::RESPONSE_ACCEPT);
 	}
 
+	get_vbox()->pack_start (progress_bar);
+
 	progress_bar.set_name (N_("TimeFXProgress"));
 
 	show_all_children ();
diff --git a/libs/ardour/plugin.cc b/libs/ardour/plugin.cc
index 2b193ab0e6..4f14a7f65d 100644
--- a/libs/ardour/plugin.cc
+++ b/libs/ardour/plugin.cc
@@ -91,9 +91,7 @@ void
 Plugin::make_nth_control (uint32_t n, const XMLNode& node)
 {
 	if (controls[n]) {
-		error << string_compose (_("programming error: %1"),
-					 X_("Plugin::make_nth_control() called too late"))
-		      << endmsg;
+		/* already constructed */
 		return;
 	}