diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 9aef4fc76a..cb492b13d4 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -1522,7 +1522,7 @@ ARDOUR_UI::session_add_midi_route ( PluginInfoPtr instrument, Plugin::PresetRecord* pset, ARDOUR::PresentationInfo::order_t order, - bool with_triggers) + bool trigger_visibility) { if (_session == 0) { warning << _("You cannot add a track without a session already loaded.") << endmsg; @@ -1540,7 +1540,7 @@ ARDOUR_UI::session_add_midi_route ( one_midi_channel.set (DataType::MIDI, 1); list > tracks; - tracks = _session->new_midi_track (one_midi_channel, one_midi_channel, strict_io, instrument, pset, route_group, how_many, name_template, order, ARDOUR::Normal, true, with_triggers); + tracks = _session->new_midi_track (one_midi_channel, one_midi_channel, strict_io, instrument, pset, route_group, how_many, name_template, order, ARDOUR::Normal, true, trigger_visibility); if (tracks.size() != how_many) { error << string_compose(P_("could not create %1 new mixed track", "could not create %1 new mixed tracks", how_many), how_many) << endmsg; @@ -1574,7 +1574,7 @@ ARDOUR_UI::session_add_audio_route ( string const & name_template, bool strict_io, ARDOUR::PresentationInfo::order_t order, - bool with_triggers) + bool trigger_visibility) { list > tracks; RouteList routes; @@ -1583,7 +1583,7 @@ ARDOUR_UI::session_add_audio_route ( try { if (track) { - tracks = _session->new_audio_track (input_channels, output_channels, route_group, how_many, name_template, order, mode, true, with_triggers); + tracks = _session->new_audio_track (input_channels, output_channels, route_group, how_many, name_template, order, mode, true, trigger_visibility); if (tracks.size() != how_many) { error << string_compose (P_("could not create %1 new audio track", "could not create %1 new audio tracks", how_many), how_many) @@ -2856,7 +2856,7 @@ ARDOUR_UI::add_route_dialog_response (int r) RouteGroup* route_group = add_route_dialog->route_group (); AutoConnectOption oac = Config->get_output_auto_connect(); bool strict_io = add_route_dialog->use_strict_io (); - bool with_triggers = true; + bool trigger_visibility = true; if (oac & AutoConnectMaster) { output_chan.set (DataType::AUDIO, (_session->master_out() ? _session->master_out()->n_inputs().n_audio() : input_chan.n_audio())); @@ -2871,13 +2871,13 @@ ARDOUR_UI::add_route_dialog_response (int r) switch (add_route_dialog->type_wanted()) { case AddRouteDialog::AudioTrack: - session_add_audio_route (true, input_chan.n_audio(), output_chan.n_audio(), add_route_dialog->mode(), route_group, count, name_template, strict_io, order, with_triggers); + session_add_audio_route (true, input_chan.n_audio(), output_chan.n_audio(), add_route_dialog->mode(), route_group, count, name_template, strict_io, order, trigger_visibility); break; case AddRouteDialog::AudioBus: session_add_audio_route (false, input_chan.n_audio(), output_chan.n_audio(), ARDOUR::Normal, route_group, count, name_template, strict_io, order, false); break; case AddRouteDialog::MidiTrack: - session_add_midi_route (true, route_group, count, name_template, strict_io, instrument, 0, order, with_triggers); + session_add_midi_route (true, route_group, count, name_template, strict_io, instrument, 0, order, trigger_visibility); break; case AddRouteDialog::MidiBus: session_add_midi_route (false, route_group, count, name_template, strict_io, instrument, 0, order, false); diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index 0d2d5111d2..30fe54da1e 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -325,11 +325,11 @@ public: void export_video (bool range = false); 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, bool with_triggers); + uint32_t, std::string const &, bool, ARDOUR::PresentationInfo::order_t order, bool trigger_visibility); void session_add_midi_route (bool, ARDOUR::RouteGroup *, uint32_t, std::string const &, bool, ARDOUR::PluginInfoPtr, ARDOUR::Plugin::PresetRecord*, - ARDOUR::PresentationInfo::order_t order, bool with_triggers); + ARDOUR::PresentationInfo::order_t order, bool trigger_visibility); void session_add_foldback_bus (int32_t, uint32_t, std::string const &);