summaryrefslogtreecommitdiff
path: root/gtk2_ardour/patch_change_dialog.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2012-06-10 16:42:17 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2012-06-10 16:42:17 +0000
commit23350c195db2a8a777ca8d471174b44255c96ec4 (patch)
treeed17d2c8545b38fdc879e96ddb13a22c6986218f /gtk2_ardour/patch_change_dialog.cc
parentdf6222b3b408ecf2aa673beb0fdff2fa309a81a1 (diff)
remove craziness of propagating MIDI 7 bit limits into MIDNAM handling by replacing bank_msb/lsb with "bank" ; move responsibility for discovering patch names into MIDI trackview (soon to move again)
git-svn-id: svn://localhost/ardour2/branches/3.0@12647 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/patch_change_dialog.cc')
-rw-r--r--gtk2_ardour/patch_change_dialog.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk2_ardour/patch_change_dialog.cc b/gtk2_ardour/patch_change_dialog.cc
index 23feab8a77..0ec12f93c2 100644
--- a/gtk2_ardour/patch_change_dialog.cc
+++ b/gtk2_ardour/patch_change_dialog.cc
@@ -167,7 +167,7 @@ PatchChangeDialog::set_active_bank_combo ()
boost::replace_all (n, "_", " ");
MIDI::Name::PatchPrimaryKey const * key = (*i)->patch_primary_key ();
- if (key && ((key->msb << 7) | key->lsb) == _bank.get_value () - 1) {
+ if (key && (key->bank_number == _bank.get_value () - 1)) {
_current_patch_bank = *i;
_ignore_signals = true;
_bank_combo.set_active_text (n);
@@ -218,7 +218,7 @@ PatchChangeDialog::bank_combo_changed ()
MIDI::Name::PatchPrimaryKey const * key = _current_patch_bank->patch_primary_key ();
if (key) {
_ignore_signals = true;
- _bank.set_value (((key->msb << 7) | key->lsb) + 1);
+ _bank.set_value (key->bank_number + 1);
_ignore_signals = false;
}
}