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.h | |
| 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.h')
| -rw-r--r-- | gtk2_ardour/ardour_ui.h | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index 0a7996ebbd..53abcd0f17 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -274,6 +274,7 @@ public: void session_add_vca (std::string const &, uint32_t); + void session_add_audio_route (bool, int32_t, int32_t, ARDOUR::TrackMode, ARDOUR::RouteGroup *, uint32_t, std::string const &, bool, ARDOUR::PresentationInfo::order_t order); void session_add_audio_track ( int input_channels, int32_t output_channels, @@ -304,21 +305,21 @@ public: uint32_t how_many, std::string const & name_template, bool strict_io, - ARDOUR::PresentationInfo::order_t order, ARDOUR::PluginInfoPtr instrument, - ARDOUR::Plugin::PresetRecord* preset = NULL) { - session_add_midi_route (true, route_group, how_many, name_template, strict_io, order, instrument, preset); + ARDOUR::Plugin::PresetRecord* preset, + ARDOUR::PresentationInfo::order_t order + ) { + session_add_midi_route (true, route_group, how_many, name_template, strict_io, instrument, preset, order); } - void session_add_mixed_track (const ARDOUR::ChanCount&, const ARDOUR::ChanCount&, ARDOUR::RouteGroup*, uint32_t, std::string const &, bool, ARDOUR::PluginInfoPtr, + void session_add_mixed_track (const ARDOUR::ChanCount&, const ARDOUR::ChanCount&, ARDOUR::RouteGroup*, uint32_t, std::string const &, bool, + ARDOUR::PluginInfoPtr, ARDOUR::Plugin::PresetRecord* pset, ARDOUR::PresentationInfo::order_t order); - void session_add_midi_bus (ARDOUR::RouteGroup*, uint32_t, std::string const &, bool, ARDOUR::PluginInfoPtr, + void session_add_midi_bus (ARDOUR::RouteGroup*, uint32_t, std::string const &, bool, ARDOUR::PluginInfoPtr, ARDOUR::Plugin::PresetRecord* pset, ARDOUR::PresentationInfo::order_t order); - void session_add_audio_route (bool, int32_t, int32_t, ARDOUR::TrackMode, ARDOUR::RouteGroup *, uint32_t, std::string const &, bool, - ARDOUR::PresentationInfo::order_t order); - void session_add_midi_route (bool, ARDOUR::RouteGroup *, uint32_t, std::string const &, bool, ARDOUR::PresentationInfo::order_t order, - ARDOUR::PluginInfoPtr, ARDOUR::Plugin::PresetRecord*); - + void session_add_midi_route (bool, ARDOUR::RouteGroup *, uint32_t, std::string const &, bool, + ARDOUR::PluginInfoPtr, ARDOUR::Plugin::PresetRecord*, + ARDOUR::PresentationInfo::order_t order); void display_insufficient_ports_message (); void attach_to_engine (); |