X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Faudio_time_axis.cc;h=4459afa799a2aefc35cd0134228032cd2a2c0c93;hb=cf52d6e4b40111eb04b244ec054055a4ec15dbe0;hp=8c022abdb74e66cc2cd1f1259a61e7767cca1944;hpb=a3c378cf62939c85bcfa3b4c55b68c9163c5e21e;p=ardour.git diff --git a/gtk2_ardour/audio_time_axis.cc b/gtk2_ardour/audio_time_axis.cc index 8c022abdb7..4459afa799 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" @@ -42,7 +42,6 @@ #include "ardour/panner_shell.h" #include "ardour_button.h" -#include "ardour_ui.h" #include "audio_time_axis.h" #include "automation_line.h" #include "enums.h" @@ -56,7 +55,7 @@ #include "audio_streamview.h" #include "utils.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace ARDOUR; @@ -66,7 +65,7 @@ using namespace Gtk; using namespace Editing; AudioTimeAxisView::AudioTimeAxisView (PublicEditor& ed, Session* sess, ArdourCanvas::Canvas& canvas) - : AxisView(sess) + : SessionHandlePtr (sess) , RouteTimeAxisView(ed, sess, canvas) { } @@ -95,8 +94,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 */ @@ -104,6 +105,15 @@ AudioTimeAxisView::set_route (boost::shared_ptr rt) create_automation_child (GainAutomation, false); } + if (automation_child (TrimAutomation) == 0) { + create_automation_child (TrimAutomation, false); + } + + /* if set_state above didn't create a mute automation child, we need to make one */ + if (automation_child (MuteAutomation) == 0) { + create_automation_child (MuteAutomation, false); + } + if (_route->panner_shell()) { _route->panner_shell()->Changed.connect (*this, invalidator (*this), boost::bind (&AudioTimeAxisView::ensure_pan_views, this, false), gui_context()); @@ -173,14 +183,14 @@ AudioTimeAxisView::create_automation_child (const Evoral::Parameter& param, bool AutomationTracks::iterator existing = _automation_tracks.find (param); if (existing != _automation_tracks.end()) { - + /* automation track created because we had existing data for * the processor, but visibility may need to be controlled * since it will have been set visible by default. */ existing->second->set_marked_for_display (show); - + if (!no_redraw) { request_redraw (); } @@ -192,6 +202,10 @@ AudioTimeAxisView::create_automation_child (const Evoral::Parameter& param, bool create_gain_automation_child (param, show); + } else if (param.type() == TrimAutomation) { + + create_trim_automation_child (param, show); + } else if (param.type() == PanWidthAutomation || param.type() == PanElevationAutomation || param.type() == PanAzimuthAutomation) { @@ -202,101 +216,13 @@ AudioTimeAxisView::create_automation_child (const Evoral::Parameter& param, bool /* handled elsewhere */ - } else { - error << "AudioTimeAxisView: unknown automation child " << EventTypeMap::instance().to_symbol(param) << endmsg; - } -} - -/** 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); + } else if (param.type() == MuteAutomation) { - /* now trigger a redisplay */ + create_mute_automation_child (param, show); - 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 */ + } else { + error << "AudioTimeAxisView: unknown automation child " << EventTypeMap::instance().to_symbol(param) << endmsg; } } @@ -381,54 +307,17 @@ AudioTimeAxisView::update_control_names () } } - if (get_selected()) { + if (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; - - 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 (); - } }