X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Faudio_time_axis.cc;h=01eda95d15aab936673f3c5c32561f66a30f4729;hb=e3dd226ffa562d28758555d67961d95723e2a2f0;hp=cc2686920aa5184b024819775f84b213e3699f54;hpb=0a87bbc37b5cba75853cf923acb66c7520c1b89b;p=ardour.git diff --git a/gtk2_ardour/audio_time_axis.cc b/gtk2_ardour/audio_time_axis.cc index cc2686920a..01eda95d15 100644 --- a/gtk2_ardour/audio_time_axis.cc +++ b/gtk2_ardour/audio_time_axis.cc @@ -31,10 +31,10 @@ #include "pbd/stl_delete.h" #include "pbd/memento_command.h" -#include -#include -#include -#include +#include "gtkmm2ext/gtk_ui.h" +#include "gtkmm2ext/selector.h" +#include "gtkmm2ext/bindable_button.h" +#include "gtkmm2ext/utils.h" #include "ardour/event_type_map.h" #include "ardour/pannable.h" @@ -95,8 +95,10 @@ AudioTimeAxisView::set_route (boost::shared_ptr rt) if (is_audio_track()) { controls_ebox.set_name ("AudioTrackControlsBaseUnselected"); + time_axis_frame.set_name ("AudioTrackControlsBaseUnselected"); } else { // bus controls_ebox.set_name ("AudioBusControlsBaseUnselected"); + time_axis_frame.set_name ("AudioBusControlsBaseUnselected"); } /* if set_state above didn't create a gain automation child, we need to make one */ @@ -217,115 +219,6 @@ AudioTimeAxisView::create_automation_child (const Evoral::Parameter& param, bool } } -/** Ensure that we have the appropriate AutomationTimeAxisViews for the - * panners that we have. - * - * @param show true to show any new views that we create, otherwise false. - */ -void -AudioTimeAxisView::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 -AudioTimeAxisView::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 -AudioTimeAxisView::update_mute_track_visibility () -{ - bool const showit = mute_automation_item->get_active(); - - if (showit != string_is_affirmative (mute_track->gui_property ("visible"))) { - mute_track->set_marked_for_display (showit); - - /* now trigger a redisplay */ - - if (!no_redraw) { - _route->gui_changed (X_("visible_tracks"), (void *) 0); /* EMIT_SIGNAL */ - } - } -} - -void -AudioTimeAxisView::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 AudioTimeAxisView::show_all_automation (bool apply_to_selection) { @@ -409,59 +302,15 @@ AudioTimeAxisView::update_control_names () if (get_selected()) { controls_ebox.set_name (controls_base_selected_name); + time_axis_frame.set_name (controls_base_selected_name); } else { controls_ebox.set_name (controls_base_unselected_name); + time_axis_frame.set_name (controls_base_unselected_name); } } void AudioTimeAxisView::build_automation_action_menu (bool for_selection) { - using namespace Menu_Helpers; - RouteTimeAxisView::build_automation_action_menu (for_selection); - - MenuList& automation_items = automation_action_menu->items (); - - automation_items.push_back (CheckMenuElem (_("Fader"), sigc::mem_fun (*this, &AudioTimeAxisView::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; - - automation_items.push_back (CheckMenuElem (_("Mute"), sigc::mem_fun (*this, &AudioTimeAxisView::update_mute_track_visibility))); - mute_automation_item = dynamic_cast (&automation_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")))); - - _main_automation_menu_map[Evoral::Parameter(MuteAutomation)] = mute_automation_item; - - if (!pan_tracks.empty()) { - automation_items.push_back (CheckMenuElem (_("Pan"), sigc::mem_fun (*this, &AudioTimeAxisView::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 -AudioTimeAxisView::enter_internal_edit_mode () -{ - if (audio_view()) { - audio_view()->enter_internal_edit_mode (); - } -} - -void -AudioTimeAxisView::leave_internal_edit_mode () -{ - if (audio_view()) { - audio_view()->leave_internal_edit_mode (); - } }