diff options
| author | Tim Mayberry <mojofunk@gmail.com> | 2016-08-30 21:53:50 +1000 |
|---|---|---|
| committer | Tim Mayberry <mojofunk@gmail.com> | 2017-04-19 09:36:59 +1000 |
| commit | edb9868e76b365f10bd9bc077662ea1cac124df3 (patch) | |
| tree | 4697df19e09f0c3accaa2222d58dcf60cbc4414d /gtk2_ardour/route_time_axis.cc | |
| parent | 23eb1fbf01fd71d8f31f7e2fb59a1f80a2770da6 (diff) | |
Remove conditional checks that are always true in RouteTimeAxisView class
Diffstat (limited to 'gtk2_ardour/route_time_axis.cc')
| -rw-r--r-- | gtk2_ardour/route_time_axis.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc index 3359f6a5d7..24a09a423a 100644 --- a/gtk2_ardour/route_time_axis.cc +++ b/gtk2_ardour/route_time_axis.cc @@ -555,7 +555,7 @@ RouteTimeAxisView::build_automation_action_menu (bool for_selection) items.push_back (CheckMenuElem (_("Fader"), sigc::mem_fun (*this, &RouteTimeAxisView::update_gain_track_visibility))); gain_automation_item = dynamic_cast<Gtk::CheckMenuItem*> (&items.back ()); gain_automation_item->set_active ((!for_selection || _editor.get_selection().tracks.size() == 1) && - (gain_track && string_is_affirmative (gain_track->gui_property ("visible")))); + string_is_affirmative (gain_track->gui_property ("visible"))); _main_automation_menu_map[Evoral::Parameter(GainAutomation)] = gain_automation_item; } @@ -564,7 +564,7 @@ RouteTimeAxisView::build_automation_action_menu (bool for_selection) items.push_back (CheckMenuElem (_("Trim"), sigc::mem_fun (*this, &RouteTimeAxisView::update_trim_track_visibility))); trim_automation_item = dynamic_cast<Gtk::CheckMenuItem*> (&items.back ()); trim_automation_item->set_active ((!for_selection || _editor.get_selection().tracks.size() == 1) && - (trim_track && string_is_affirmative (trim_track->gui_property ("visible")))); + string_is_affirmative (trim_track->gui_property ("visible"))); _main_automation_menu_map[Evoral::Parameter(TrimAutomation)] = trim_automation_item; } @@ -573,7 +573,7 @@ RouteTimeAxisView::build_automation_action_menu (bool for_selection) items.push_back (CheckMenuElem (_("Mute"), sigc::mem_fun (*this, &RouteTimeAxisView::update_mute_track_visibility))); mute_automation_item = dynamic_cast<Gtk::CheckMenuItem*> (&items.back ()); mute_automation_item->set_active ((!for_selection || _editor.get_selection().tracks.size() == 1) && - (mute_track && string_is_affirmative (mute_track->gui_property ("visible")))); + string_is_affirmative (mute_track->gui_property ("visible"))); _main_automation_menu_map[Evoral::Parameter(MuteAutomation)] = mute_automation_item; } @@ -582,7 +582,7 @@ RouteTimeAxisView::build_automation_action_menu (bool for_selection) items.push_back (CheckMenuElem (_("Pan"), sigc::mem_fun (*this, &RouteTimeAxisView::update_pan_track_visibility))); pan_automation_item = dynamic_cast<Gtk::CheckMenuItem*> (&items.back ()); pan_automation_item->set_active ((!for_selection || _editor.get_selection().tracks.size() == 1) && - (!pan_tracks.empty() && string_is_affirmative (pan_tracks.front()->gui_property ("visible")))); + string_is_affirmative (pan_tracks.front()->gui_property ("visible"))); set<Evoral::Parameter> const & params = _route->pannable()->what_can_be_automated (); for (set<Evoral::Parameter>::const_iterator p = params.begin(); p != params.end(); ++p) { |