ardour/livetrax
13
0
Fork 0
Code

use correct event struct when handling key events in patch changes, and flip semantics for next/prev bank so that the direction in numerical terms matches next/prev patch (i.e. up arrow goes to higher numbers)

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@13043 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-07-15 14:43:38 +00:00
parent 35eba54e51
commit 9816ed02c7
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk2_ardour/canvas_patch_change.cc
View File

@ -187,7 +187,7 @@ CanvasPatchChange::on_event (GdkEvent* ev)
case GDK_Up:
case GDK_KP_Up:
case GDK_uparrow:
if (Keyboard::modifier_state_contains (ev->scroll.state, Keyboard::PrimaryModifier)) {
if (Keyboard::modifier_state_contains (ev->key.state, Keyboard::PrimaryModifier)) {
_region.previous_bank (*this);
} else {
_region.previous_patch (*this);
@ -196,7 +196,7 @@ CanvasPatchChange::on_event (GdkEvent* ev)
case GDK_Down:
case GDK_KP_Down:
case GDK_downarrow:
if (Keyboard::modifier_state_contains (ev->scroll.state, Keyboard::PrimaryModifier)) {
if (Keyboard::modifier_state_contains (ev->key.state, Keyboard::PrimaryModifier)) {
_region.next_bank (*this);
} else {
_region.next_patch (*this);

4
gtk2_ardour/midi_region_view.cc
View File

@ -1972,7 +1972,7 @@ MidiRegionView::next_patch (CanvasPatchChange& patch)
}
void
MidiRegionView::previous_bank (CanvasPatchChange& patch)
MidiRegionView::next_bank (CanvasPatchChange& patch)
{
if (patch.patch()->program() < 127) {
MIDI::Name::PatchPrimaryKey key = patch_change_to_patch_key (patch.patch());
@ -1984,7 +1984,7 @@ MidiRegionView::previous_bank (CanvasPatchChange& patch)
}
void
MidiRegionView::next_bank (CanvasPatchChange& patch)
MidiRegionView::previous_bank (CanvasPatchChange& patch)
{
if (patch.patch()->program() > 0) {
MIDI::Name::PatchPrimaryKey key = patch_change_to_patch_key (patch.patch());