X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_keys.cc;h=2ef22c827395acbce0f36d7b8215ba8fdb4b3e16;hb=dadee4622d15218e0190b72797897fbb7b247711;hp=1826ee464dc30cacd82f0f0b36964b71f13b0d1a;hpb=e0aaed6d65f160c328cb8b56d7c6552ee15d65e2;p=ardour.git

diff --git a/gtk2_ardour/editor_keys.cc b/gtk2_ardour/editor_keys.cc
index 1826ee464d..2ef22c8273 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
@@ -37,18 +37,17 @@
 
 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 (0, 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;
 			}
-				
+
 		}
 	}
 }
@@ -99,7 +98,7 @@ Editor::keyboard_insert_region_list_selection ()
 }
 
 int
-Editor::get_prefix (float& val, bool& was_floating)
+Editor::get_prefix (float& /*val*/, bool& was_floating)
 {
 	was_floating = false;
 	return 1;