smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-10 16:46:35 +01:00
Code Issues Projects Releases Wiki Activity

Fix key stealing on MIDI region views.

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@3102 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2008-02-21 20:20:40 +00:00
parent 4b5ee47d44
commit 2921166139
2 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
gtk2_ardour/midi_region_view.cc
View file

@ -152,17 +152,18 @@ MidiRegionView::canvas_event(GdkEvent* ev)
switch (ev->type) { switch (ev->type) {
case GDK_KEY_PRESS: case GDK_KEY_PRESS:
cout << "KEY" << endl;
if (ev->key.keyval == GDK_Delete && !delete_mod) { if (ev->key.keyval == GDK_Delete && !delete_mod) {
delete_mod = true; delete_mod = true;
original_mode = trackview.editor.current_midi_edit_mode(); original_mode = trackview.editor.current_midi_edit_mode();
trackview.editor.set_midi_edit_mode(MidiEditErase); trackview.editor.set_midi_edit_mode(MidiEditErase);
start_remove_command(); start_remove_command();
_mouse_state = EraseTouchDragging; _mouse_state = EraseTouchDragging;
return true;
} else if (ev->key.keyval == GDK_Shift_L || ev->key.keyval == GDK_Control_L) { } else if (ev->key.keyval == GDK_Shift_L || ev->key.keyval == GDK_Control_L) {
_mouse_state = SelectTouchDragging; _mouse_state = SelectTouchDragging;
return true;
} }
return true; return false;
case GDK_KEY_RELEASE: case GDK_KEY_RELEASE:
if (ev->key.keyval == GDK_Delete) { if (ev->key.keyval == GDK_Delete) {
@ -174,10 +175,12 @@ MidiRegionView::canvas_event(GdkEvent* ev)
trackview.editor.set_midi_edit_mode(original_mode); trackview.editor.set_midi_edit_mode(original_mode);
delete_mod = false; delete_mod = false;
} }
return true;
} else if (ev->key.keyval == GDK_Shift_L || ev->key.keyval == GDK_Control_L) { } else if (ev->key.keyval == GDK_Shift_L || ev->key.keyval == GDK_Control_L) {
_mouse_state = None; _mouse_state = None;
return true;
} }
return true; return false;
case GDK_BUTTON_PRESS: case GDK_BUTTON_PRESS:
if (_mouse_state != SelectTouchDragging && _mouse_state != EraseTouchDragging) if (_mouse_state != SelectTouchDragging && _mouse_state != EraseTouchDragging)

7
gtk2_ardour/opts.cc
View file

@ -132,10 +132,9 @@ ARDOUR_COMMAND_LINE::parse_opts (int argc, char *argv[])
ARDOUR::Session::set_disable_all_loaded_plugins (true); ARDOUR::Session::set_disable_all_loaded_plugins (true);
break; break;
case 'm':
case 'm': menus_file = optarg;
menus_file = optarg; break;
break;
case 'n': case 'n':
no_splash = false; no_splash = false;