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 d06b9f85aad8c0e62546fc9e67878af69d352d39..930c5a229d6997cc82ed4a629863956c48e0075a 100644 (file)
--- 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,10 +21,11 @@
 #include <cmath>
 #include <string>
 
-#include <pbd/error.h>
+#include "pbd/error.h"
 
-#include <ardour/session.h>
-#include <ardour/region.h>
+#include "ardour/session.h"
+#include "ardour/region.h"
+#include <gtkmm/treeview.h>
 
 #include "ardour_ui.h"
 #include "editor.h"
@@ -36,20 +37,17 @@
 
 using namespace ARDOUR;
 using namespace PBD;
-using namespace sigc;
 
 void
 Editor::keyboard_selection_finish (bool add)
 {
-       cerr << "here\n";
+       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;
@@ -59,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;
@@ -69,81 +67,32 @@ 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;
                        }
-                               
-               }
-       }
-}
-
-void
-Editor::keyboard_duplicate_region ()
-{
-       if (selection->regions.empty()) {
-               return;
-       }
-
-       float prefix = 0;
-       bool was_floating;
-
-       if (get_prefix (prefix, was_floating) == 0) {
-               duplicate_some_regions (selection->regions, prefix);
-       } else {
-               duplicate_some_regions (selection->regions, 1);
-       }
-}
 
-void
-Editor::keyboard_duplicate_selection ()
-{
-       float prefix = 0;
-       bool was_floating;
-
-       if (get_prefix (prefix, was_floating) == 0) {
-               duplicate_selection (prefix);
-       } else {
-               duplicate_selection (1);
+               }
        }
 }
 
 void
 Editor::keyboard_paste ()
 {
-       float prefix = 0;
-       bool was_floating;
-
-       if (get_prefix (prefix, was_floating) == 0) {
-               paste (prefix);
-       } else {
-               paste (1);
-       }
-}
-
-void
-Editor::keyboard_insert_region_list_selection ()
-{
-       float prefix = 0;
-       bool was_floating;
-
-       if (get_prefix (prefix, was_floating) == 0) {
-               insert_region_list_selection (prefix);
-       } else {
-               insert_region_list_selection (1);
-       }
+       ensure_entered_track_selected (true);
+       paste (1);
 }
 
 int
-Editor::get_prefix (float& val, bool& was_floating)
+Editor::get_prefix (float& /*val*/, bool& was_floating)
 {
        was_floating = false;
        return 1;