diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2012-06-10 16:42:17 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-06-10 16:42:17 +0000 |
commit | 23350c195db2a8a777ca8d471174b44255c96ec4 (patch) | |
tree | ed17d2c8545b38fdc879e96ddb13a22c6986218f /libs/midi++2/midnam_patch.cc | |
parent | df6222b3b408ecf2aa673beb0fdff2fa309a81a1 (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 'libs/midi++2/midnam_patch.cc')
-rw-r--r-- | libs/midi++2/midnam_patch.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libs/midi++2/midnam_patch.cc b/libs/midi++2/midnam_patch.cc index 86edc7504e..66d3219310 100644 --- a/libs/midi++2/midnam_patch.cc +++ b/libs/midi++2/midnam_patch.cc @@ -78,10 +78,12 @@ int initialize_primary_key_from_commands (PatchPrimaryKey& id, const XMLNode* no string value = node->property("Value")->value(); assert(value != ""); + id.bank_number = 0; + if (control == "0") { - id.msb = PBD::atoi(value); + id.bank_number |= (PBD::atoi (value)<<7); } else if (control == "32") { - id.lsb = PBD::atoi(value); + id.bank_number |= PBD::atoi (value); } } else if (node->name() == "ProgramChange") { string number = node->property("Number")->value(); @@ -135,8 +137,7 @@ Patch::use_bank_info (PatchBank* bank) { if (bank) { if (bank->patch_primary_key() ) { - _id.msb = bank->patch_primary_key()->msb; - _id.lsb = bank->patch_primary_key()->lsb; + _id.bank_number = bank->patch_primary_key()->bank_number; } else { return -1; } |