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 95289c7f5a52fecfe33e7f31f5db290c37f62c47..4a5d55d879427bbc4871fc732bd44d8fdc554582 100644 (file)
--- a/gtk2_ardour/editor_keyboard.cc
+++ b/gtk2_ardour/editor_keyboard.cc
@@ -15,19 +15,23 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #include <ardour/audioregion.h>
 #include <ardour/playlist.h>
+#include <ardour/location.h>
+
 #include <pbd/memento_command.h>
 
 #include "editor.h"
 #include "region_view.h"
 #include "selection.h"
+#include "keyboard.h"
 
 #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)
 {
@@ -44,6 +48,14 @@ Editor::kbd_driver (sigc::slot<void,GdkEvent*> theslot, bool use_track_canvas, b
                doit = true;
        }
 
+       /* any use of "keyboard mouse buttons" invalidates an existing grab
+       */
+       
+       if (drag_info.item) {
+               drag_info.item->ungrab (GDK_CURRENT_TIME);
+               drag_info.item = 0;
+       }
+
        if (doit) {
 
                if (entered_regionview && can_select) {
@@ -63,97 +75,21 @@ Editor::kbd_driver (sigc::slot<void,GdkEvent*> theslot, bool use_track_canvas, b
        }
 }
 
-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)
-{
-       jack_nframes_t where = event_frame (ev);
-
-       if (entered_regionview) {
-               if (selection->regions.find (entered_regionview) != selection->regions.end()) {
-                       split_regions_at (where, selection->regions);
-               } else {
-                       RegionSelection s;
-                       s.add (entered_regionview);
-                       split_regions_at (where, s);
-               }
-       }
-}
-
-void
-Editor::kbd_split ()
-{
-       kbd_driver (mem_fun(*this, &Editor::kbd_do_split), true, true, false);
-}
-
 void
 Editor::kbd_mute_unmute_region ()
 {
        if (entered_regionview) {
                begin_reversible_command (_("mute region"));
-               XMLNode &before = entered_regionview->region().playlist()->get_state();
+               XMLNode &before = entered_regionview->region()->playlist()->get_state();
                
-           entered_regionview->region().set_muted (!entered_regionview->region().muted());
+               entered_regionview->region()->set_muted (!entered_regionview->region()->muted());
                
-               XMLNode &after = entered_regionview->region().playlist()->get_state();
-               session->add_command (new MementoCommand<ARDOUR::Playlist>(*(entered_regionview->region().playlist()), &before, &after));
+               XMLNode &after = entered_regionview->region()->playlist()->get_state();
+               session->add_command (new MementoCommand<ARDOUR::Playlist>(*(entered_regionview->region()->playlist()), &before, &after));
                commit_reversible_command();
        }
 }
 
-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)
-{
-    jack_nframes_t where = event_frame (ev);
-       snap_to (where);
-
-       if (entered_regionview) {
-         set_a_regions_sync_position (entered_regionview->region(), where);
-       }
-}
-
-void
-Editor::kbd_do_align (GdkEvent* ev, ARDOUR::RegionPoint what)
-{
-       align (what);
-}
-
-void
-Editor::kbd_align (ARDOUR::RegionPoint what)
-{
-       kbd_driver (bind (mem_fun(*this, &Editor::kbd_do_align), what));
-}
-
-void
-Editor::kbd_do_align_relative (GdkEvent* ev, ARDOUR::RegionPoint what)
-{
-       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)
 {
@@ -166,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);
-}