Add option to use narrow mixer strips by default, and fix ardour_system.rc being...

[ardour.git] / gtk2_ardour / editor_keyboard.cc

diff --git a/gtk2_ardour/editor_keyboard.cc b/gtk2_ardour/editor_keyboard.cc
index 18897259d86affb42177c8e8446bd3b23ece1db4..4a5d55d879427bbc4871fc732bd44d8fdc554582 100644 (file)
--- a/gtk2_ardour/editor_keyboard.cc
+++ b/gtk2_ardour/editor_keyboard.cc
@@ -19,6 +19,8 @@
 
 #include <ardour/audioregion.h>
 #include <ardour/playlist.h>
+#include <ardour/location.h>
+
 #include <pbd/memento_command.h>
 
 #include "editor.h"
@@ -28,6 +30,8 @@
 
 #include "i18n.h"
 
+using namespace ARDOUR;
+
 void
 Editor::kbd_driver (sigc::slot<void,GdkEvent*> theslot, bool use_track_canvas, bool use_time_canvas, bool can_select)
 {
@@ -71,70 +75,6 @@ Editor::kbd_driver (sigc::slot<void,GdkEvent*> theslot, bool use_track_canvas, b
        }
 }
 
-void
-Editor::set_playhead_cursor (GdkEvent* event)
-{
-       if (entered_marker) {
-               session->request_locate (entered_marker->position(), session->transport_rolling());
-       } else {
-               nframes_t pointer_frame = event_frame (event);
-               
-               if (!Keyboard::modifier_state_contains (event->button.state, Keyboard::snap_modifier())) {
-                       snap_to (pointer_frame);
-               }
-               
-               if (session) {
-                       session->request_locate (pointer_frame, session->transport_rolling());
-               }
-       }
-}
-
-void
-Editor::kbd_set_playhead_cursor ()
-{
-       kbd_driver (mem_fun(*this, &Editor::set_playhead_cursor), true, true, false);
-}
-
-void
-Editor::kbd_set_edit_cursor ()
-{
-       kbd_driver (mem_fun(*this, &Editor::set_edit_cursor), true, true, false);
-}
-
-void
-Editor::kbd_do_split (GdkEvent* ev)
-{
-       if (entered_regionview) {
-
-               nframes_t where = event_frame (ev);
-               snap_to (where);
-
-               if (selection->regions.contains (entered_regionview)) {
-                       split_regions_at (where, selection->regions);
-               } else {
-                       RegionSelection s;
-                       s.add (entered_regionview);
-                       split_regions_at (where, s);
-               }
-
-       } else if (entered_marker) {
-
-               if (!selection->regions.empty()) {
-                       split_regions_at (entered_marker->position(), selection->regions);
-               } else {
-                       RegionSelection rs;
-                       rs = get_regions_at (entered_marker->position(), selection->tracks);
-                       split_regions_at (entered_marker->position(), rs);
-               }
-       }
-}
-
-void
-Editor::kbd_split ()
-{
-       kbd_driver (mem_fun(*this, &Editor::kbd_do_split), true, true, false);
-}
-
 void
 Editor::kbd_mute_unmute_region ()
 {
@@ -150,97 +90,6 @@ Editor::kbd_mute_unmute_region ()
        }
 }
 
-void
-Editor::kbd_set_sync_position ()
-{
-       kbd_driver (mem_fun(*this, &Editor::kbd_do_set_sync_position), true, true, false);
-}
-
-void
-Editor::kbd_do_set_sync_position (GdkEvent* ev)
-{
-       if (entered_regionview) {
-               nframes64_t where = event_frame (ev);
-               snap_to (where);
-
-               set_a_regions_sync_position (entered_regionview->region(), where);
-
-       } else if (entered_marker) {
-
-               if (!selection->regions.empty()) {
-                       set_a_regions_sync_position (selection->regions.front()->region(), entered_marker->position());
-               }
-       }
-}
-
-void
-Editor::kbd_do_align (GdkEvent* ev, ARDOUR::RegionPoint what)
-{
-       if (entered_regionview) {
-
-               nframes_t where = event_frame (ev);
-               snap_to (where);
-
-               if (selection->regions.contains (entered_regionview)) {
-                       align_selection (what, where, selection->regions);
-               } else {
-                       RegionSelection s;
-                       s.add (entered_regionview);
-                       align_selection (what, where, s);
-               }
-
-       } else if (entered_marker) {
-
-               if (!selection->regions.empty()) {
-                       align_selection (what, entered_marker->position(), selection->regions);
-               } else {
-                       RegionSelection rs;
-                       rs = get_regions_at (entered_marker->position(), selection->tracks);
-                       align_selection (what, entered_marker->position(), rs);
-               }
-       }
-}
-
-void
-Editor::kbd_do_align_relative (GdkEvent* ev, ARDOUR::RegionPoint what)
-{
-       if (entered_regionview) {
-
-               nframes_t where = event_frame (ev);
-               snap_to (where);
-
-               if (selection->regions.contains (entered_regionview)) {
-                       align_selection_relative (what, where, selection->regions);
-               } else {
-                       RegionSelection s;
-                       s.add (entered_regionview);
-                       align_selection_relative (what, where, s);
-               }
-
-       } else if (entered_marker) {
-
-               if (!selection->regions.empty()) {
-                       align_selection_relative (what, entered_marker->position(), selection->regions);
-               } else {
-                       RegionSelection rs;
-                       rs = get_regions_at (entered_marker->position(), selection->tracks);
-                       align_selection_relative (what, entered_marker->position(), rs);
-               }
-       }
-}
-
-void
-Editor::kbd_align (ARDOUR::RegionPoint what)
-{
-       kbd_driver (bind (mem_fun(*this, &Editor::kbd_do_align), what));
-}
-
-void
-Editor::kbd_align_relative (ARDOUR::RegionPoint what)
-{
-       kbd_driver (bind (mem_fun(*this, &Editor::kbd_do_align), what), true, true, false);
-}
-
 void
 Editor::kbd_do_brush (GdkEvent *ev)
 {
@@ -253,14 +102,3 @@ Editor::kbd_brush ()
        kbd_driver (mem_fun(*this, &Editor::kbd_do_brush), true, true, false);
 }
 
-void
-Editor::kbd_do_audition (GdkEvent *ignored)
-{
-       audition_selected_region ();
-}
-
-void
-Editor::kbd_audition ()
-{
-       kbd_driver (mem_fun(*this, &Editor::kbd_do_audition), true, false, true);
-}