allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

MIDI patch changes should never be event-sensitive unless we're in internal/note edit mode

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@13948 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis
2013-01-21 14:43:19 +00:00
parent dabd5bd174
commit c939a66249
1 changed files with 27 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
gtk2_ardour/canvas_patch_change.cc
View File

@@ -155,28 +155,28 @@ in_edit_mode(Editor* editor)
bool
CanvasPatchChange::on_event (GdkEvent* ev)
{
Editor* e;
/* XXX: icky dcast */
Editor* e = dynamic_cast<Editor*> (&_region.get_time_axis_view().editor());
if (!in_edit_mode(e)) {
return false;
}
switch (ev->type) {
case GDK_BUTTON_PRESS:
/* XXX: icky dcast */
e = dynamic_cast<Editor*> (&_region.get_time_axis_view().editor());
if (in_edit_mode(e)) {
if (Gtkmm2ext::Keyboard::is_delete_event (&ev->button)) {
_region.delete_patch_change (this);
return true;
} else if (Gtkmm2ext::Keyboard::is_edit_event (&ev->button)) {
_region.edit_patch_change (this);
return true;
} else if (ev->button.button == 1) {
e->drags()->set (new PatchChangeDrag (e, this, &_region), ev);
return true;
}
if (Gtkmm2ext::Keyboard::is_delete_event (&ev->button)) {
_region.delete_patch_change (this);
return true;
} else if (Gtkmm2ext::Keyboard::is_edit_event (&ev->button)) {
_region.edit_patch_change (this);
return true;
} else if (ev->button.button == 1) {
e->drags()->set (new PatchChangeDrag (e, this, &_region), ev);
return true;
}
if (ev->button.button == 3) {
@@ -221,26 +221,20 @@ CanvasPatchChange::on_event (GdkEvent* ev)
break;
case GDK_SCROLL:
/* XXX: icky dcast */
e = dynamic_cast<Editor*> (&_region.get_time_axis_view().editor());
if (in_edit_mode(e)) {
if (ev->scroll.direction == GDK_SCROLL_UP) {
if (Keyboard::modifier_state_contains (ev->scroll.state, Keyboard::PrimaryModifier)) {
_region.previous_bank (*this);
} else {
_region.previous_patch (*this);
}
} else if (ev->scroll.direction == GDK_SCROLL_DOWN) {
if (ev->scroll.direction == GDK_SCROLL_UP) {
if (Keyboard::modifier_state_contains (ev->scroll.state, Keyboard::PrimaryModifier)) {
_region.previous_bank (*this);
} else {
_region.previous_patch (*this);
}
} else if (ev->scroll.direction == GDK_SCROLL_DOWN) {
if (Keyboard::modifier_state_contains (ev->scroll.state, Keyboard::PrimaryModifier)) {
_region.next_bank (*this);
} else {
_region.next_patch (*this);
}
}
return true;
break;
}
break;
return true;
case GDK_ENTER_NOTIFY:
_region.patch_entered (this);