From 9b4d330285ba542051193025285ac946a91399ee Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Fri, 29 Jan 2021 01:07:36 +0100 Subject: [PATCH] Remove unused variable `ignore_toggle` is never set to true. --- gtk2_ardour/audio_time_axis.cc | 2 -- gtk2_ardour/foldback_strip.cc | 5 ----- gtk2_ardour/midi_time_axis.cc | 2 -- gtk2_ardour/mixer_strip.cc | 9 --------- gtk2_ardour/route_time_axis.cc | 2 -- gtk2_ardour/route_ui.cc | 4 ---- gtk2_ardour/route_ui.h | 1 - 7 files changed, 25 deletions(-) diff --git a/gtk2_ardour/audio_time_axis.cc b/gtk2_ardour/audio_time_axis.cc index aa09bb4050..8055b6d31a 100644 --- a/gtk2_ardour/audio_time_axis.cc +++ b/gtk2_ardour/audio_time_axis.cc @@ -99,8 +99,6 @@ AudioTimeAxisView::set_route (boost::shared_ptr rt) subplugin_menu.set_name ("ArdourContextMenu"); - ignore_toggle = false; - if (is_audio_track()) { controls_ebox.set_name ("AudioTrackControlsBaseUnselected"); time_axis_frame.set_name ("AudioTrackControlsBaseUnselected"); diff --git a/gtk2_ardour/foldback_strip.cc b/gtk2_ardour/foldback_strip.cc index 8cb8f82d80..f9a9e76a80 100644 --- a/gtk2_ardour/foldback_strip.cc +++ b/gtk2_ardour/foldback_strip.cc @@ -367,7 +367,6 @@ FoldbackStrip::init () { _entered_foldback_strip= 0; ignore_comment_edit = false; - ignore_toggle = false; comment_area = 0; _previous_button.set_name ("mixer strip button"); @@ -844,10 +843,6 @@ FoldbackStrip::output_press (GdkEventButton *ev) void FoldbackStrip::bundle_output_chosen (boost::shared_ptr c) { - if (ignore_toggle) { - return; - } - _route->output()->connect_ports_to_bundle (c, true, true, this); } diff --git a/gtk2_ardour/midi_time_axis.cc b/gtk2_ardour/midi_time_axis.cc index 01d3d9e874..a5fb8aac7a 100644 --- a/gtk2_ardour/midi_time_axis.cc +++ b/gtk2_ardour/midi_time_axis.cc @@ -181,8 +181,6 @@ MidiTimeAxisView::set_route (boost::shared_ptr rt) _view->ContentsHeightChanged.connect ( sigc::mem_fun (*this, &MidiTimeAxisView::contents_height_changed)); - ignore_toggle = false; - if (is_midi_track()) { _note_mode = midi_track()->note_mode(); } diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index 6ea23b0a66..096adfe922 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -176,7 +176,6 @@ MixerStrip::init () group_menu = 0; route_ops_menu = 0; ignore_comment_edit = false; - ignore_toggle = false; comment_area = 0; _width_owner = 0; @@ -1124,20 +1123,12 @@ MixerStrip::input_press (GdkEventButton *ev) void MixerStrip::bundle_input_chosen (boost::shared_ptr c) { - if (ignore_toggle) { - return; - } - _route->input()->connect_ports_to_bundle (c, true, this); } void MixerStrip::bundle_output_chosen (boost::shared_ptr c) { - if (ignore_toggle) { - return; - } - _route->output()->connect_ports_to_bundle (c, true, true, this); } diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc index ece9845a17..403bf964cf 100644 --- a/gtk2_ardour/route_time_axis.cc +++ b/gtk2_ardour/route_time_axis.cc @@ -178,8 +178,6 @@ RouteTimeAxisView::set_route (boost::shared_ptr rt) timestretch_rect = 0; no_redraw = false; - ignore_toggle = false; - route_group_button.set_name ("route button"); playlist_button.set_name ("route button"); automation_button.set_name ("route button"); diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc index e6a3e3cd94..a00de166b9 100644 --- a/gtk2_ardour/route_ui.cc +++ b/gtk2_ardour/route_ui.cc @@ -1750,10 +1750,6 @@ RouteUI::route_rename () void RouteUI::toggle_comment_editor () { -// if (ignore_toggle) { -// return; -// } - if (comment_window && comment_window->is_visible ()) { comment_window->hide (); } else { diff --git a/gtk2_ardour/route_ui.h b/gtk2_ardour/route_ui.h index 31ecec0a5b..9cda02d886 100644 --- a/gtk2_ardour/route_ui.h +++ b/gtk2_ardour/route_ui.h @@ -122,7 +122,6 @@ public: void select_midi_patch (); - bool ignore_toggle; bool wait_for_release; bool multiple_mute_change; bool multiple_solo_change;