ardour/livetrax
13
0
Fork 0
Code

Support midnam files with a channel (not patch) NoteNameList.

Browse Source
This commit is contained in:
David Robillard 2014-07-13 23:36:45 -04:00
parent 97a99f545f
commit fe9f2b15b1
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libs/midi++2/midnam_patch.cc
View File

@ -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(