diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 5e5f4e755f..6d54eef9bc 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -306,7 +306,6 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir) , _shared_popup_menu (0) , startup_fsm (0) , secondary_clock_spacer (0) - , auto_input_button (ArdourButton::led_default_elements) , latency_disable_button (ArdourButton::led_default_elements) , time_info_box (0) , auto_return_button (ArdourButton::led_default_elements) diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index 7b8a442dee..5c2547048f 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -502,14 +502,9 @@ private: ArdourWidgets::ArdourButton layered_button; ArdourWidgets::ArdourVSpacer recpunch_spacer; - ArdourWidgets::ArdourVSpacer monitoring_spacer; ArdourWidgets::ArdourVSpacer latency_spacer; ArdourWidgets::ArdourVSpacer monitor_spacer; - ArdourWidgets::ArdourButton monitor_in_button; - ArdourWidgets::ArdourButton monitor_disk_button; - ArdourWidgets::ArdourButton auto_input_button; - ArdourWidgets::ArdourButton monitor_dim_button; ArdourWidgets::ArdourButton monitor_mono_button; ArdourWidgets::ArdourButton monitor_mute_button; @@ -518,7 +513,6 @@ private: Gtk::Label layered_label; Gtk::Label punch_space; - Gtk::Label mon_space; void toggle_external_sync (); void toggle_time_master (); diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc index 5f22d4708e..f625514e14 100644 --- a/gtk2_ardour/ardour_ui2.cc +++ b/gtk2_ardour/ardour_ui2.cc @@ -86,7 +86,6 @@ ARDOUR_UI::setup_tooltips () set_tip (auto_return_button, _("Return to last playback start when stopped")); set_tip (follow_edits_button, _("Playhead follows Range tool clicks, and Range selections")); - set_tip (auto_input_button, _("Track Input Monitoring automatically follows transport state")); parameter_changed("click-gain"); set_tip (solo_alert_button, _("When active, something is soloed.\nClick to de-solo everything")); set_tip (auditioning_alert_button, _("When active, auditioning is taking place.\nClick to stop the audition")); @@ -206,19 +205,6 @@ ARDOUR_UI::repack_transport_hbox () } } - bool show_mon = UIConfiguration::instance().get_show_toolbar_monitoring (); - if (show_mon) { - monitor_in_button.show (); - monitor_disk_button.show (); - auto_input_button.show (); - monitoring_spacer.show (); - } else { - monitor_in_button.hide (); - monitor_disk_button.hide (); - auto_input_button.hide (); - monitoring_spacer.hide (); - } - bool show_rec = UIConfiguration::instance().get_show_toolbar_recpunch (); if (show_rec) { punch_label.show (); @@ -319,19 +305,12 @@ ARDOUR_UI::setup_transport () auto_return_button.set_related_action (act); act = ActionManager::get_action (X_("Transport"), X_("ToggleFollowEdits")); follow_edits_button.set_related_action (act); - act = ActionManager::get_action ("Transport", "ToggleAutoInput"); - auto_input_button.set_related_action (act); act = ActionManager::get_action ("Transport", "TogglePunchIn"); punch_in_button.set_related_action (act); act = ActionManager::get_action ("Transport", "TogglePunchOut"); punch_out_button.set_related_action (act); - act = ActionManager::get_action ("Transport", "SessionMonitorIn"); - monitor_in_button.set_related_action (act); - act = ActionManager::get_action ("Transport", "SessionMonitorDisk"); - monitor_disk_button.set_related_action (act); - act = ActionManager::get_action (X_("Monitor Section"), X_("monitor-dim-all")); monitor_dim_button.set_related_action (act); act = ActionManager::get_action (X_("Monitor Section"), X_("monitor-mono")); @@ -389,10 +368,6 @@ ARDOUR_UI::setup_transport () punch_out_button.set_name ("punch button"); layered_button.set_name (("layered button")); - monitor_in_button.set_name ("monitor button"); - monitor_disk_button.set_name ("monitor button"); - auto_input_button.set_name ("transport option button"); - latency_disable_button.set_name ("latency button"); monitor_dim_button.set_name ("monitor section dim"); @@ -416,10 +391,6 @@ ARDOUR_UI::setup_transport () punch_out_button.set_text (_("Out")); layered_button.set_text (_("Non-Layered")); - monitor_in_button.set_text (_("All In")); - monitor_disk_button.set_text (_("All Disk")); - auto_input_button.set_text (_("Auto-Input")); - latency_disable_button.set_text (_("Disable PDC")); io_latency_label.set_text (_("I/O Latency:")); @@ -447,9 +418,6 @@ ARDOUR_UI::setup_transport () Gtkmm2ext::UI::instance()->set_tip (punch_in_button, _("Start recording at auto-punch start")); Gtkmm2ext::UI::instance()->set_tip (punch_out_button, _("Stop recording at auto-punch end")); - Gtkmm2ext::UI::instance()->set_tip (monitor_in_button, _("Force all tracks to monitor Input, unless they are explicitly set to monitor Disk")); - Gtkmm2ext::UI::instance()->set_tip (monitor_disk_button, _("Force all tracks to monitor Disk playback, unless they are explicitly set to Input")); - /* monitor section */ Gtkmm2ext::UI::instance()->set_tip (monitor_dim_button, _("Monitor section dim output")); Gtkmm2ext::UI::instance()->set_tip (monitor_mono_button, _("Monitor section mono output")); @@ -461,10 +429,6 @@ ARDOUR_UI::setup_transport () punch_button_size_group->add_widget (punch_in_button); punch_button_size_group->add_widget (punch_out_button); - Glib::RefPtr monitoring_button_size_group = SizeGroup::create (Gtk::SIZE_GROUP_HORIZONTAL); - monitoring_button_size_group->add_widget (monitor_in_button); - monitoring_button_size_group->add_widget (monitor_disk_button); - Glib::RefPtr monitor_button_size_group = SizeGroup::create (Gtk::SIZE_GROUP_HORIZONTAL); monitor_button_size_group->add_widget (monitor_dim_button); monitor_button_size_group->add_widget (monitor_mono_button); @@ -531,11 +495,6 @@ ARDOUR_UI::setup_transport () button_height_size_group->add_widget (punch_out_button); button_height_size_group->add_widget (layered_button); - //input monitoring section - button_height_size_group->add_widget (monitor_in_button); - button_height_size_group->add_widget (monitor_disk_button); - button_height_size_group->add_widget (auto_input_button); - // PDC button_height_size_group->add_widget (latency_disable_button); @@ -585,16 +544,6 @@ ARDOUR_UI::setup_transport () transport_table.attach (recpunch_spacer, TCOL, 0, 2 , SHRINK, EXPAND|FILL, 3, 0); ++col; - transport_table.attach (auto_input_button, col, col + 3, 0, 1 , FILL, SHRINK, hpadding, vpadding); - transport_table.attach (monitor_in_button, col, col + 1, 1, 2 , FILL, SHRINK, hpadding, vpadding); - transport_table.attach (mon_space, col + 1, col + 2, 1, 2 , FILL, SHRINK, 2, vpadding); - transport_table.attach (monitor_disk_button, col + 2, col + 3, 1, 2 , FILL, SHRINK, hpadding, vpadding); - col += 3; - - transport_table.attach (monitoring_spacer, TCOL, 0, 2 , SHRINK, EXPAND|FILL, 3, 0); - ++col; - - transport_table.attach (latency_disable_button, TCOL, 0, 1 , FILL, SHRINK, hpadding, vpadding); transport_table.attach (io_latency_label, TCOL, 1, 2 , SHRINK, EXPAND|FILL, hpadding, 0); ++col; diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc index 5f15091e3c..262b4f17cf 100644 --- a/gtk2_ardour/rc_option_editor.cc +++ b/gtk2_ardour/rc_option_editor.cc @@ -4174,14 +4174,6 @@ RCOptionEditor::RCOptionEditor () sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_toolbar_recpunch) )); - add_option (_("Appearance/Toolbar"), - new BoolOption ( - "show-toolbar-monitoring", - _("Display Monitoring Options"), - sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_show_toolbar_monitoring), - sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_toolbar_monitoring) - )); - add_option (_("Appearance/Toolbar"), new BoolOption ( "show-toolbar-latency", diff --git a/gtk2_ardour/ui_config_vars.h b/gtk2_ardour/ui_config_vars.h index 84aeebb9d0..89c7c29057 100644 --- a/gtk2_ardour/ui_config_vars.h +++ b/gtk2_ardour/ui_config_vars.h @@ -88,7 +88,7 @@ UI_CONFIG_VARIABLE (float, meter_peak, "meter-peak", 0.0f) UI_CONFIG_VARIABLE (bool, meter_style_led, "meter-style-led", false) UI_CONFIG_VARIABLE (bool, show_editor_meter, "show-editor-meter", true) UI_CONFIG_VARIABLE (bool, show_toolbar_recpunch, "show-toolbar-recpunch", true) -UI_CONFIG_VARIABLE (bool, show_toolbar_monitoring, "show-toolbar-monitoring", false) +UI_CONFIG_VARIABLE (bool, show_toolbar_monitoring, "show-toolbar-monitoring", false) /* deprecated */ UI_CONFIG_VARIABLE (bool, show_toolbar_selclock, "show-toolbar-selclock", false) UI_CONFIG_VARIABLE (bool, show_toolbar_latency, "show-toolbar-latency", false) UI_CONFIG_VARIABLE (bool, show_toolbar_monitor_info, "show-toolbar-monitor-info", false)