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 baa158cbf8374c6e73ceda214b1227ccbbcda0db..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
@@ -15,41 +15,51 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #include <cstdlib>
 #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"
 #include "time_axis_view.h"
-#include "regionview.h"
+#include "region_view.h"
 #include "selection.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) {
-               begin_reversible_command (_("keyboard selection"));
+       if (_session && have_pending_keyboard_selection) {
+
+               framepos_t end;
+               bool ignored;
+
+               if (_session->transport_rolling()) {
+                       end = _session->audible_frame();
+               } else {
+                       if (!mouse_frame (end, ignored)) {
+                               return;
+                       }
+               }
+
                if (add) {
-                       selection->add (pending_keyboard_selection_start, session->audible_frame());
+                       selection->add (pending_keyboard_selection_start, end);
                } else {
-                       selection->set (0, pending_keyboard_selection_start, session->audible_frame());
+                       selection->set (pending_keyboard_selection_start, end);
                }
-               commit_reversible_command ();
+
                have_pending_keyboard_selection = false;
        }
 }
@@ -57,71 +67,34 @@ Editor::keyboard_selection_finish (bool add)
 void
 Editor::keyboard_selection_begin ()
 {
-       if (session) {
-               pending_keyboard_selection_start = session->audible_frame();
-               have_pending_keyboard_selection = true;
-       }
-}
-
-void
-Editor::keyboard_duplicate_region ()
-{
-       if (selection->audio_regions.empty()) {
-               return;
-       }
-
-       float prefix;
-       bool was_floating;
-
-       if (get_prefix (prefix, was_floating) == 0) {
-               duplicate_some_regions (selection->audio_regions, prefix);
-       } else {
-               duplicate_some_regions (selection->audio_regions, 1);
-       }
-}
+       if (_session) {
+               if (_session->transport_rolling()) {
+                       pending_keyboard_selection_start = _session->audible_frame();
+                       have_pending_keyboard_selection = true;
+               } else {
+                       bool ignored;
+                       framepos_t where; // XXX fix me
 
-void
-Editor::keyboard_duplicate_selection ()
-{
-       float prefix;
-       bool was_floating;
+                       if (mouse_frame (where, ignored)) {
+                               pending_keyboard_selection_start = where;
+                               have_pending_keyboard_selection = true;
+                       }
 
-       if (get_prefix (prefix, was_floating) == 0) {
-               duplicate_selection (prefix);
-       } else {
-               duplicate_selection (1);
+               }
        }
 }
 
 void
 Editor::keyboard_paste ()
 {
-       float prefix;
-       bool was_floating;
-
-       if (get_prefix (prefix, was_floating) == 0) {
-               paste (prefix);
-       } else {
-               paste (1);
-       }
-}
-
-void
-Editor::keyboard_insert_region_list_selection ()
-{
-       float prefix;
-       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)
 {
-       return Keyboard::the_keyboard().get_prefix (val, was_floating);
+       was_floating = false;
+       return 1;
 }