diff options
| author | David Robillard <d@drobilla.net> | 2014-07-13 23:36:45 -0400 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2014-07-15 15:18:18 -0400 |
| commit | fe9f2b15b13ce1e8216305f4c3916582ab65f8df (patch) | |
| tree | 447d36d938ad02e545039ecc09f10e022e2dad49 | |
| parent | 97a99f545fac87c1d5eb0ec3f1742d0a10a9a2c1 (diff) | |
Support midnam files with a channel (not patch) NoteNameList.
| -rw-r--r-- | libs/midi++2/midnam_patch.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libs/midi++2/midnam_patch.cc b/libs/midi++2/midnam_patch.cc index 252804e466..1ec6062205 100644 --- a/libs/midi++2/midnam_patch.cc +++ b/libs/midi++2/midnam_patch.cc @@ -724,14 +724,13 @@ MasterDeviceNames::note_name(const std::string& mode_name, return ""; } + boost::shared_ptr<const NoteNameList> note_names; boost::shared_ptr<const Patch> patch( find_patch(mode_name, channel, PatchPrimaryKey(program, bank))); - if (!patch) { - return ""; + if (patch) { + note_names = note_name_list(patch->note_list_name()); } - boost::shared_ptr<const NoteNameList> note_names( - note_name_list(patch->note_list_name())); if (!note_names) { /* No note names specific to this patch, check the ChannelNameSet */ boost::shared_ptr<ChannelNameSet> chan_names = channel_name_set_by_channel( |