From 0f72ea4a349480cf1272571395f63c10b6152b4f Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sun, 30 Nov 2014 16:24:18 -0500 Subject: Factor out duplicated track automation code. Mute automation for MIDI tracks. --- gtk2_ardour/midi_time_axis.cc | 110 ------------------------------------------ 1 file changed, 110 deletions(-) (limited to 'gtk2_ardour/midi_time_axis.cc') diff --git a/gtk2_ardour/midi_time_axis.cc b/gtk2_ardour/midi_time_axis.cc index 5f19e0e2a5..c3e42a0968 100644 --- a/gtk2_ardour/midi_time_axis.cc +++ b/gtk2_ardour/midi_time_axis.cc @@ -598,7 +598,6 @@ MidiTimeAxisView::build_automation_action_menu (bool for_selection) build_controller_menu (); - automation_items.push_back (SeparatorElem()); automation_items.push_back (MenuElem (_("Controllers"), *controller_menu)); automation_items.back().set_sensitive ( !for_selection || _editor.get_selection().tracks.size() == 1); @@ -607,27 +606,6 @@ MidiTimeAxisView::build_automation_action_menu (bool for_selection) MenuElem (string_compose ("%1", _("No MIDI Channels selected")))); dynamic_cast (automation_items.back().get_child())->set_use_markup (true); } - - automation_items.push_back (SeparatorElem()); - automation_items.push_back (CheckMenuElem (_("Fader"), sigc::mem_fun (*this, &MidiTimeAxisView::update_gain_track_visibility))); - gain_automation_item = dynamic_cast (&automation_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")))); - - _main_automation_menu_map[Evoral::Parameter(GainAutomation)] = gain_automation_item; - - if (!pan_tracks.empty()) { - automation_items.push_back (CheckMenuElem (_("Pan"), sigc::mem_fun (*this, &MidiTimeAxisView::update_pan_track_visibility))); - pan_automation_item = dynamic_cast (&automation_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")))); - - set const & params = _route->pannable()->what_can_be_automated (); - for (set::const_iterator p = params.begin(); p != params.end(); ++p) { - _main_automation_menu_map[*p] = pan_automation_item; - } - } - } void @@ -1119,94 +1097,6 @@ MidiTimeAxisView::update_range() } } -void -MidiTimeAxisView::ensure_pan_views (bool show) -{ - bool changed = false; - for (list >::iterator i = pan_tracks.begin(); i != pan_tracks.end(); ++i) { - changed = true; - (*i)->set_marked_for_display (false); - } - if (changed) { - _route->gui_changed (X_("visible_tracks"), (void *) 0); /* EMIT_SIGNAL */ - } - pan_tracks.clear(); - - if (!_route->panner()) { - return; - } - - set params = _route->panner()->what_can_be_automated(); - set::iterator p; - - for (p = params.begin(); p != params.end(); ++p) { - boost::shared_ptr pan_control = _route->pannable()->automation_control(*p); - - if (pan_control->parameter().type() == NullAutomation) { - error << "Pan control has NULL automation type!" << endmsg; - continue; - } - - if (automation_child (pan_control->parameter ()).get () == 0) { - - /* we don't already have an AutomationTimeAxisView for this parameter */ - - std::string const name = _route->panner()->describe_parameter (pan_control->parameter ()); - - boost::shared_ptr t ( - new AutomationTimeAxisView (_session, - _route, - _route->pannable(), - pan_control, - pan_control->parameter (), - _editor, - *this, - false, - parent_canvas, - name) - ); - - pan_tracks.push_back (t); - add_automation_child (*p, t, show); - } else { - pan_tracks.push_back (automation_child (pan_control->parameter ())); - } - } -} - -void -MidiTimeAxisView::update_gain_track_visibility () -{ - bool const showit = gain_automation_item->get_active(); - - if (showit != string_is_affirmative (gain_track->gui_property ("visible"))) { - gain_track->set_marked_for_display (showit); - - /* now trigger a redisplay */ - - if (!no_redraw) { - _route->gui_changed (X_("visible_tracks"), (void *) 0); /* EMIT_SIGNAL */ - } - } -} - -void -MidiTimeAxisView::update_pan_track_visibility () -{ - bool const showit = pan_automation_item->get_active(); - bool changed = false; - - for (list >::iterator i = pan_tracks.begin(); i != pan_tracks.end(); ++i) { - if ((*i)->set_marked_for_display (showit)) { - changed = true; - } - } - - if (changed) { - _route->gui_changed (X_("visible_tracks"), (void *) 0); /* EMIT_SIGNAL */ - } -} - void MidiTimeAxisView::show_all_automation (bool apply_to_selection) { -- cgit v1.2.3