NO-OP backport changes from Mixbus branch.

[ardour.git] / gtk2_ardour / editor_keys.cc

diff --git a/gtk2_ardour/editor_keys.cc b/gtk2_ardour/editor_keys.cc
index efbe0cb522be71fa182e336d477bed3b2eb4b4ed..fba52014bce43fe844ea9643c278f34c8e5bd90e 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,87 +21,95 @@
 #include <cmath>
 #include <string>
 
-#include <pbd/error.h>
-
-#include <ardour/session.h>
-#include <ardour/region.h>
 #include <gtkmm/treeview.h>
 
-#include "ardour_ui.h"
+#include "pbd/error.h"
+
+#include "ardour/session.h"
+
 #include "editor.h"
-#include "time_axis_view.h"
 #include "region_view.h"
 #include "selection.h"
+#include "time_axis_view.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;
-using namespace sigc;
+using namespace Editing;
 
 void
-Editor::keyboard_selection_finish (bool add)
+Editor::keyboard_selection_finish (bool /*add*/, Editing::EditIgnoreOption ign)
 {
-       if (session && have_pending_keyboard_selection) {
+       if (_session) {
 
-               nframes64_t end;
-               bool ignored;
+               framepos_t start = selection->time.start();
+               framepos_t end;
 
-               if (session->transport_rolling()) {
-                       end = session->audible_frame();
+               if ((_edit_point == EditAtPlayhead) && _session->transport_rolling()) {
+                       end = _session->audible_frame();
                } else {
-                       if (!mouse_frame (end, ignored)) {
-                               return;
-                       }
+                       end = get_preferred_edit_position(ign);
                }
 
-               if (add) {
-                       selection->add (pending_keyboard_selection_start, end);
-               } else {
-                       selection->set (0, pending_keyboard_selection_start, end);
-               }
+               //snap the selection start/end
+               snap_to(start);
+
+               //if no tracks are selected and we're working from the keyboard, enable all tracks (_something_ has to be selected for any range selection)
+               if ( (_edit_point == EditAtPlayhead) && selection->tracks.empty() )
+                       select_all_tracks();
+
+               selection->set (start, end);
+
+               //if session is playing a range, cancel that
+               if (_session->get_play_range())
+                       _session->request_cancel_play_range();
 
-               have_pending_keyboard_selection = false;
        }
 }
 
 void
-Editor::keyboard_selection_begin ()
+Editor::keyboard_selection_begin (Editing::EditIgnoreOption ign)
 {
-       if (session) {
-               if (session->transport_rolling()) {
-                       pending_keyboard_selection_start = session->audible_frame();
-                       have_pending_keyboard_selection = true;
+       if (_session) {
+
+               framepos_t start;
+               framepos_t end = selection->time.end_frame();
+
+               if ((_edit_point == EditAtPlayhead) && _session->transport_rolling()) {
+                       start = _session->audible_frame();
                } else {
-                       bool ignored;
-                       nframes64_t where; // XXX fix me
-
-                       if (mouse_frame (where, ignored)) {
-                               pending_keyboard_selection_start = where;
-                               have_pending_keyboard_selection = true;
-                       }
-                               
+                       start = get_preferred_edit_position(ign);
                }
+
+               //snap the selection start/end
+               snap_to(start);
+
+               //if there's not already a sensible selection endpoint, go "forever"
+               if (start > end) {
+#ifdef MIXBUS
+                       // 4hours at most.
+                       // This works around a visual glitch in red-bordered selection rect.
+                       end = start + _session->nominal_frame_rate() * 60 * 60 * 4;
+#else
+                       end = max_framepos;
+#endif
+               }
+
+               //if no tracks are selected and we're working from the keyboard, enable all tracks (_something_ has to be selected for any range selection)
+               if ( selection->tracks.empty() )
+                       select_all_tracks();
+
+               selection->set (start, end);
+
+               //if session is playing a range, cancel that
+               if (_session->get_play_range())
+                       _session->request_cancel_play_range();
        }
 }
 
 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;
+       paste (1, false);
 }
-