X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_keys.cc;h=e1562dbe053ae78031185d82f478453c0604fd33;hb=d5f55246cc9d1922bfdaf144aaad083f20e49064;hp=a31711a4d07e439df0edb60a9f76fad45e1792b3;hpb=bb9cc45cd22af67ac275a5e73accbe14fee664d8;p=ardour.git

diff --git a/gtk2_ardour/editor_keys.cc b/gtk2_ardour/editor_keys.cc
index a31711a4d0..e1562dbe05 100644
--- a/gtk2_ardour/editor_keys.cc
+++ b/gtk2_ardour/editor_keys.cc
@@ -21,87 +21,89 @@
 #include <cmath>
 #include <string>
 
+#include <gtkmm/treeview.h>
+
 #include "pbd/error.h"
 
 #include "ardour/session.h"
-#include "ardour/region.h"
-#include <gtkmm/treeview.h>
 
-#include "ardour_ui.h"
 #include "editor.h"
-#include "time_axis_view.h"
 #include "region_view.h"
 #include "selection.h"
+#include "time_axis_view.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;
-using namespace sigc;
+using namespace Editing;
 
 void
-Editor::keyboard_selection_finish (bool add)
+Editor::keyboard_selection_finish (bool /*add*/, Editing::EditIgnoreOption ign)
 {
-	if (session && have_pending_keyboard_selection) {
+	if (_session) {
 
-		nframes64_t end;
-		bool ignored;
+		framepos_t start = selection->time.start();
+		framepos_t end;
 
-		if (session->transport_rolling()) {
-			end = session->audible_frame();
+		if ((_edit_point == EditAtPlayhead) && _session->transport_rolling()) {
+			end = _session->audible_frame();
 		} else {
-			if (!mouse_frame (end, ignored)) {
-				return;
-			}
+			end = get_preferred_edit_position(ign);
 		}
 
-		if (add) {
-			selection->add (pending_keyboard_selection_start, end);
-		} else {
-			selection->set (0, pending_keyboard_selection_start, end);
-		}
+		//snap the selection start/end
+		snap_to(start);
+
+		//if no tracks are selected and we're working from the keyboard, enable all tracks (_something_ has to be selected for any range selection)
+		if ( (_edit_point == EditAtPlayhead) && selection->tracks.empty() )
+			select_all_tracks();
+
+		selection->set (start, end);
+
+		//if session is playing a range, cancel that
+		if (_session->get_play_range())
+			_session->request_cancel_play_range();
 
-		have_pending_keyboard_selection = false;
 	}
 }
 
 void
-Editor::keyboard_selection_begin ()
+Editor::keyboard_selection_begin (Editing::EditIgnoreOption ign)
 {
-	if (session) {
-		if (session->transport_rolling()) {
-			pending_keyboard_selection_start = session->audible_frame();
-			have_pending_keyboard_selection = true;
+	if (_session) {
+
+		framepos_t start;
+		framepos_t end = selection->time.end_frame();  //0 if no current selection
+
+		if ((_edit_point == EditAtPlayhead) && _session->transport_rolling()) {
+			start = _session->audible_frame();
 		} else {
-			bool ignored;
-			nframes64_t where; // XXX fix me
+			start = get_preferred_edit_position(ign);
+		}
 
-			if (mouse_frame (where, ignored)) {
-				pending_keyboard_selection_start = where;
-				have_pending_keyboard_selection = true;
-			}
+		//snap the selection start/end
+		snap_to(start);
 
+		//if there's not already a sensible selection endpoint, go "forever"
+		if ( start > end ) {
+			end = max_framepos;
 		}
+
+		//if no tracks are selected and we're working from the keyboard, enable all tracks (_something_ has to be selected for any range selection)
+		if ( selection->tracks.empty() )
+			select_all_tracks();
+
+		selection->set (start, end);
+
+		//if session is playing a range, cancel that
+		if (_session->get_play_range())
+			_session->request_cancel_play_range();
 	}
 }
 
 void
 Editor::keyboard_paste ()
 {
-	ensure_entered_track_selected (true);
-	paste (1);
-}
-
-void
-Editor::keyboard_insert_region_list_selection ()
-{
-	insert_region_list_selection (1);
-}
-
-int
-Editor::get_prefix (float& /*val*/, bool& was_floating)
-{
-	was_floating = false;
-	return 1;
+	paste (1, false);
 }
-