From 237dfb53e70096daa9b804a8092822d571bccba9 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Mon, 13 Dec 2021 15:12:30 -0700 Subject: [PATCH] remove add trigger check box from add route dialog (always use triggers) --- gtk2_ardour/add_route_dialog.cc | 11 ----------- gtk2_ardour/add_route_dialog.h | 3 --- gtk2_ardour/ardour_ui.cc | 2 +- 3 files changed, 1 insertion(+), 15 deletions(-) diff --git a/gtk2_ardour/add_route_dialog.cc b/gtk2_ardour/add_route_dialog.cc index d4335ca7d1..308aca58f5 100644 --- a/gtk2_ardour/add_route_dialog.cc +++ b/gtk2_ardour/add_route_dialog.cc @@ -80,7 +80,6 @@ AddRouteDialog::AddRouteDialog () , strict_io_label (_("Pin Mode:")) , mode_label (_("Record Mode:")) , instrument_label (_("Instrument:")) - , with_triggers_label (_("Add TriggerBox:")) , last_route_count (1) , route_count_set_by_template (false) , name_edited_by_user (false) @@ -311,10 +310,6 @@ AddRouteDialog::AddRouteDialog () ++n; } - with_triggers_label.set_alignment (Gtk::ALIGN_RIGHT, Gtk::ALIGN_CENTER); - settings_table->attach (with_triggers_label, 4, 5, n, n+1, Gtk::FILL, Gtk::SHRINK, 0, 0); - settings_table->attach (with_triggers, 5, 6, n, n+1, Gtk::FILL, Gtk::SHRINK, 0, 0); - ++n; HBox* outer_box = manage (new HBox); @@ -1007,12 +1002,6 @@ AddRouteDialog::route_group () return _session->route_group_by_name (route_group_combo.get_active_text()); } - -bool -AddRouteDialog::use_triggers() { - return with_triggers.get_active(); -} - bool AddRouteDialog::use_strict_io() { return strict_io_combo.get_active_row_number () == 1; diff --git a/gtk2_ardour/add_route_dialog.h b/gtk2_ardour/add_route_dialog.h index 1e93bb48fc..3b029d361f 100644 --- a/gtk2_ardour/add_route_dialog.h +++ b/gtk2_ardour/add_route_dialog.h @@ -89,7 +89,6 @@ public: RouteDialogs::InsertAt insert_at(); bool use_strict_io(); - bool use_triggers(); std::string get_template_path(); @@ -109,13 +108,11 @@ private: Gtk::Label strict_io_label; Gtk::Label mode_label; Gtk::Label instrument_label; - Gtk::Label with_triggers_label; Gtk::ComboBoxText mode_combo; Gtk::ComboBoxText route_group_combo; InstrumentSelector instrument_combo; Gtk::ComboBoxText insert_at_combo; Gtk::ComboBoxText strict_io_combo; - Gtk::CheckButton with_triggers; void track_type_chosen (); void refill_channel_setups (); diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 85eb525e9d..e38009ed88 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -2849,7 +2849,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 = add_route_dialog->use_triggers (); + bool with_triggers = true; if (oac & AutoConnectMaster) { output_chan.set (DataType::AUDIO, (_session->master_out() ? _session->master_out()->n_inputs().n_audio() : input_chan.n_audio()));