Tidy up the region menu a bit, and hopefully clarify what regions will be

[ardour.git] / gtk2_ardour / editor_keys.cc

diff --git a/gtk2_ardour/editor_keys.cc b/gtk2_ardour/editor_keys.cc
index a31711a4d07e439df0edb60a9f76fad45e1792b3..930c5a229d6997cc82ed4a629863956c48e0075a 100644 (file)
--- a/gtk2_ardour/editor_keys.cc
+++ b/gtk2_ardour/editor_keys.cc
@@ -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,13 +67,13 @@ 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;
@@ -92,12 +91,6 @@ Editor::keyboard_paste ()
        paste (1);
 }
 
-void
-Editor::keyboard_insert_region_list_selection ()
-{
-       insert_region_list_selection (1);
-}
-
 int
 Editor::get_prefix (float& /*val*/, bool& was_floating)
 {