diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2016-05-17 08:21:05 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-05-31 15:30:42 -0400 |
| commit | 2c9c2102138f20e32545f8bda7d1dc72587663e8 (patch) | |
| tree | 5fc48fa8131d7b10dda47cd3c1eb97d5cf72b36a /gtk2_ardour/ardour_ui.cc | |
| parent | 4b0a235f91c43a0011b2bc466a910c5b015560e0 (diff) | |
manually fix rebase/merge issues caused by addition of plugin presets to methods which add a new track/bus
Diffstat (limited to 'gtk2_ardour/ardour_ui.cc')
| -rw-r--r-- | gtk2_ardour/ardour_ui.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index ac541901c1..07a4e5a5b8 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -1900,9 +1900,9 @@ ARDOUR_UI::session_add_midi_route ( one_midi_channel.set (DataType::MIDI, 1); if (disk) { - session_add_mixed_track (one_midi_channel, one_midi_channel, route_group, how_many, name_template, strict_io, order, instrument, pset); + session_add_mixed_track (one_midi_channel, one_midi_channel, route_group, how_many, name_template, strict_io, instrument, pset, order); } else { - session_add_midi_bus (route_group, how_many, name_template, strict_io, order, instrument, pset); + session_add_midi_bus (route_group, how_many, name_template, strict_io, instrument, pset, order); } } |