diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2014-01-11 15:19:18 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-01-11 15:19:18 -0500 |
| commit | 59631acc5f41153a294c97ab820a4b41a886e24c (patch) | |
| tree | 1e1b4fe2b2008eb790d1ffc0dcb5945c4b143c2f /libs/ardour/ardour/midi_patch_manager.h | |
| parent | 943bcc29cc05bc1d75df505cd259659a72dc56b1 (diff) | |
| parent | 72d8ca89e2f4b2e194b2bbd99261deb5b2108a40 (diff) | |
fix merge with master
Diffstat (limited to 'libs/ardour/ardour/midi_patch_manager.h')
| -rw-r--r-- | libs/ardour/ardour/midi_patch_manager.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/ardour/ardour/midi_patch_manager.h b/libs/ardour/ardour/midi_patch_manager.h index e9751c6956..cd898aa00f 100644 --- a/libs/ardour/ardour/midi_patch_manager.h +++ b/libs/ardour/ardour/midi_patch_manager.h @@ -72,7 +72,7 @@ public: boost::shared_ptr<MIDI::Name::MasterDeviceNames> master_device = master_device_by_model(model); if (master_device != 0 && custom_device_mode != "") { - return master_device->channel_name_set_by_device_mode_and_channel(custom_device_mode, channel); + return master_device->channel_name_set_by_channel(custom_device_mode, channel); } else { return boost::shared_ptr<ChannelNameSet>(); } |