X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_keyboard.cc;h=da6fadfe16bb4db7b5e93a3502669b087ca61b71;hb=f7bff95fbce75cb0d4c717b1400677edd814f7be;hp=4b0088f0753496a719b236612ed88083fdc6a1be;hpb=44dde5e7f4b7533545eba093bd2a08e97ae398c2;p=ardour.git diff --git a/gtk2_ardour/editor_keyboard.cc b/gtk2_ardour/editor_keyboard.cc index 4b0088f075..da6fadfe16 100644 --- a/gtk2_ardour/editor_keyboard.cc +++ b/gtk2_ardour/editor_keyboard.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 Paul Davis + Copyright (C) 2004 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 @@ -17,16 +17,25 @@ */ -#include -#include -#include +#include "pbd/memento_command.h" +#include "pbd/stateful_diff_command.h" + +#include "ardour/audioregion.h" +#include "ardour/playlist.h" +#include "ardour/session.h" +#include "ardour/location.h" #include "editor.h" #include "region_view.h" #include "selection.h" +#include "keyboard.h" +#include "editor_drag.h" #include "i18n.h" +using namespace ARDOUR; +using namespace PBD; + void Editor::kbd_driver (sigc::slot theslot, bool use_track_canvas, bool use_time_canvas, bool can_select) { @@ -34,7 +43,7 @@ Editor::kbd_driver (sigc::slot theslot, bool use_track_canvas, b double worldx, worldy; GdkEvent ev; Gdk::ModifierType mask; - Glib::RefPtr evw = track_canvas.get_window()->get_pointer (x, y, mask); + Glib::RefPtr evw = track_canvas->get_window()->get_pointer (x, y, mask); bool doit = false; if (use_track_canvas && track_canvas_event_box.get_window()->get_pointer(x, y, mask) != 0) { @@ -43,14 +52,21 @@ Editor::kbd_driver (sigc::slot theslot, bool use_track_canvas, b doit = true; } + /* any use of "keyboard mouse buttons" invalidates an existing grab + */ + + if (_drags->active ()) { + _drags->abort (); + } + if (doit) { if (entered_regionview && can_select) { selection->set (entered_regionview); } - track_canvas.window_to_world (x, y, worldx, worldy); - worldx += horizontal_adjustment.get_value(); + track_canvas->window_to_world (x, y, worldx, worldy); + worldx += horizontal_position(); worldy += vertical_adjustment.get_value(); ev.type = GDK_BUTTON_PRESS; @@ -63,103 +79,37 @@ Editor::kbd_driver (sigc::slot theslot, bool use_track_canvas, b } void -Editor::kbd_set_playhead_cursor () +Editor::kbd_mute_unmute_region () { - kbd_driver (mem_fun(*this, &Editor::set_playhead_cursor), true, true, false); -} + if (!selection->regions.empty ()) { -void -Editor::kbd_set_edit_cursor () -{ - kbd_driver (mem_fun(*this, &Editor::set_edit_cursor), true, true, false); -} + if (selection->regions.size() > 1) { + begin_reversible_command (_("mute regions")); + } else { + begin_reversible_command (_("mute region")); + } + for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) { -void -Editor::kbd_do_split (GdkEvent* ev) -{ - nframes_t where = event_frame (ev); + (*i)->region()->playlist()->clear_history (); + (*i)->region()->set_muted (!(*i)->region()->muted ()); + _session->add_command (new StatefulDiffCommand ((*i)->region()->playlist())); - if (entered_regionview) { - if (selection->regions.contains (entered_regionview)) { - split_regions_at (where, selection->regions); - } else { - RegionSelection s; - - /* add equivalent regions to the selection that we'll split */ - vector eq; - get_equivalent_regions (entered_regionview, eq); - for (vector::iterator i = eq.begin(); i != eq.end(); ++i) { - s.add (*i); - } - - split_regions_at (where, s); } - } -} -void -Editor::kbd_split () -{ - kbd_driver (mem_fun(*this, &Editor::kbd_do_split), true, true, false); -} + commit_reversible_command (); + + } else if (entered_regionview) { -void -Editor::kbd_mute_unmute_region () -{ - if (entered_regionview) { begin_reversible_command (_("mute region")); - XMLNode &before = entered_regionview->region()->playlist()->get_state(); - + entered_regionview->region()->playlist()->clear_history (); entered_regionview->region()->set_muted (!entered_regionview->region()->muted()); - - XMLNode &after = entered_regionview->region()->playlist()->get_state(); - session->add_command (new MementoCommand(*(entered_regionview->region()->playlist()), &before, &after)); + _session->add_command (new StatefulDiffCommand (entered_regionview->region()->playlist())); 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) -{ - 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) { @@ -169,17 +119,6 @@ Editor::kbd_do_brush (GdkEvent *ev) void Editor::kbd_brush () { - kbd_driver (mem_fun(*this, &Editor::kbd_do_brush), true, true, false); + kbd_driver (sigc::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); -}