X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_keys.cc;h=93eba4b79f02c24b714b52de0212bd4247acba90;hb=b604dd24139b4c84f20521af91ec4c0cd721bd13;hp=03a025743c9bd42eed1f136d070a5eec2b8a5ba1;hpb=4297071b3f7360b17d81ef9cf36b8d75d46d2818;p=ardour.git

diff --git a/gtk2_ardour/editor_keys.cc b/gtk2_ardour/editor_keys.cc
index 03a025743c..93eba4b79f 100644
--- a/gtk2_ardour/editor_keys.cc
+++ b/gtk2_ardour/editor_keys.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000 Paul Davis 
+    Copyright (C) 2000 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -21,34 +21,33 @@
 #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"
 
 using namespace ARDOUR;
 using namespace PBD;
-using namespace sigc;
 
 void
 Editor::keyboard_selection_finish (bool add)
 {
-	if (session && have_pending_keyboard_selection) {
+	if (_session && have_pending_keyboard_selection) {
 
-		nframes64_t end;
+		framepos_t end;
 		bool ignored;
 
-		if (session->transport_rolling()) {
-			end = session->audible_frame();
+		if (_session->transport_rolling()) {
+			end = _session->audible_frame();
 		} else {
 			if (!mouse_frame (end, ignored)) {
 				return;
@@ -58,7 +57,7 @@ Editor::keyboard_selection_finish (bool add)
 		if (add) {
 			selection->add (pending_keyboard_selection_start, end);
 		} else {
-			selection->set (TimeAxisViewPtr (), pending_keyboard_selection_start, end);
+			selection->set (pending_keyboard_selection_start, end);
 		}
 
 		have_pending_keyboard_selection = false;
@@ -68,19 +67,19 @@ Editor::keyboard_selection_finish (bool add)
 void
 Editor::keyboard_selection_begin ()
 {
-	if (session) {
-		if (session->transport_rolling()) {
-			pending_keyboard_selection_start = session->audible_frame();
+	if (_session) {
+		if (_session->transport_rolling()) {
+			pending_keyboard_selection_start = _session->audible_frame();
 			have_pending_keyboard_selection = true;
 		} else {
 			bool ignored;
-			nframes64_t where; // XXX fix me
+			framepos_t where; // XXX fix me
 
 			if (mouse_frame (where, ignored)) {
 				pending_keyboard_selection_start = where;
 				have_pending_keyboard_selection = true;
 			}
-				
+
 		}
 	}
 }
@@ -88,20 +87,5 @@ Editor::keyboard_selection_begin ()
 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;
-}
-