X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Faudio_time_axis.cc;h=994f167014ef726a6078a039014709ecf6bdb699;hb=848e75aaeaa04a81883ed30bcd04abd862f9d1fd;hp=d791290562d48700c5fbbb9ee3f80837b29fcef4;hpb=8b68ed57ec5c075261639435be3290c3ba8177eb;p=ardour.git diff --git a/gtk2_ardour/audio_time_axis.cc b/gtk2_ardour/audio_time_axis.cc index d791290562..994f167014 100644 --- a/gtk2_ardour/audio_time_axis.cc +++ b/gtk2_ardour/audio_time_axis.cc @@ -36,23 +36,16 @@ #include #include -#include "ardour/amp.h" -#include "ardour/audioplaylist.h" #include "ardour/event_type_map.h" -#include "ardour/location.h" +#include "ardour/pannable.h" #include "ardour/panner.h" -#include "ardour/playlist.h" -#include "ardour/processor.h" -#include "ardour/profile.h" -#include "ardour/session.h" -#include "ardour/session_playlist.h" -#include "ardour/utils.h" +#include "ardour/panner_shell.h" +#include "ardour_button.h" #include "ardour_ui.h" #include "audio_time_axis.h" #include "automation_line.h" #include "canvas_impl.h" -#include "crossfade_view.h" #include "enums.h" #include "gui_thread.h" #include "automation_time_axis.h" @@ -65,8 +58,6 @@ #include "audio_streamview.h" #include "utils.h" -#include "ardour/audio_track.h" - #include "i18n.h" using namespace std; @@ -75,40 +66,48 @@ using namespace PBD; using namespace Gtk; using namespace Editing; -AudioTimeAxisView::AudioTimeAxisView (PublicEditor& ed, Session* sess, boost::shared_ptr rt, Canvas& canvas) +AudioTimeAxisView::AudioTimeAxisView (PublicEditor& ed, Session* sess, Canvas& canvas) : AxisView(sess) - , RouteTimeAxisView(ed, sess, rt, canvas) + , RouteTimeAxisView(ed, sess, canvas) +{ +} + +void +AudioTimeAxisView::set_route (boost::shared_ptr rt) { + _route = rt; + + /* RouteTimeAxisView::set_route() sets up some things in the View, + so it must be created before RouteTimeAxis::set_route() is + called. + */ + _view = new AudioStreamView (*this); + + RouteTimeAxisView::set_route (rt); + + _view->apply_color (color (), StreamView::RegionColor); + // Make sure things are sane... assert(!is_track() || is_audio_track()); subplugin_menu.set_name ("ArdourContextMenu"); - _view = new AudioStreamView (*this); - ignore_toggle = false; - mute_button->set_active (false); - solo_button->set_active (false); - if (is_audio_track()) { controls_ebox.set_name ("AudioTrackControlsBaseUnselected"); } else { // bus controls_ebox.set_name ("AudioBusControlsBaseUnselected"); } - ensure_xml_node (); - - set_state (*xml_node, Stateful::loading_state_version); - /* if set_state above didn't create a gain automation child, we need to make one */ if (automation_child (GainAutomation) == 0) { create_automation_child (GainAutomation, false); } - if (_route->panner()) { - _route->panner()->Changed.connect (*this, invalidator (*this), - boost::bind (&AudioTimeAxisView::ensure_pan_views, this, false), gui_context()); + if (_route->panner_shell()) { + _route->panner_shell()->Changed.connect (*this, invalidator (*this), + boost::bind (&AudioTimeAxisView::ensure_pan_views, this, false), gui_context()); } /* map current state of the route */ @@ -154,50 +153,54 @@ AudioTimeAxisView::audio_view() guint32 AudioTimeAxisView::show_at (double y, int& nth, Gtk::VBox *parent) { - ensure_xml_node (); - xml_node->add_property ("shown-editor", "yes"); - + set_gui_property ("visible", true); return TimeAxisView::show_at (y, nth, parent); } void AudioTimeAxisView::hide () { - ensure_xml_node (); - xml_node->add_property ("shown-editor", "no"); - + set_gui_property ("visible", false); TimeAxisView::hide (); } - void -AudioTimeAxisView::append_extra_display_menu_items () +AudioTimeAxisView::create_automation_child (const Evoral::Parameter& param, bool show) { - using namespace Menu_Helpers; + if (param.type() == NullAutomation) { + return; + } - MenuList& items = display_menu->items(); + 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 (); + } - // crossfade stuff - if (!Profile->get_sae()) { - items.push_back (MenuElem (_("Hide All Crossfades"), sigc::mem_fun(*this, &AudioTimeAxisView::hide_all_xfades))); - items.push_back (MenuElem (_("Show All Crossfades"), sigc::mem_fun(*this, &AudioTimeAxisView::show_all_xfades))); + return; } -} -void -AudioTimeAxisView::create_automation_child (const Evoral::Parameter& param, bool show) -{ if (param.type() == GainAutomation) { create_gain_automation_child (param, show); - } else if (param.type() == PanAutomation) { + } else if (param.type() == PanWidthAutomation || + param.type() == PanElevationAutomation || + param.type() == PanAzimuthAutomation) { - ensure_xml_node (); ensure_pan_views (show); } else if (param.type() == PluginAutomation) { - + /* handled elsewhere */ } else { @@ -217,13 +220,11 @@ AudioTimeAxisView::ensure_pan_views (bool show) return; } - const set& params = _route->panner()->what_can_be_automated(); + set params = _route->panner()->what_can_be_automated(); set::iterator p; for (p = params.begin(); p != params.end(); ++p) { - boost::shared_ptr pan_control - = boost::dynamic_pointer_cast( - _route->panner()->control(*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; @@ -238,7 +239,10 @@ AudioTimeAxisView::ensure_pan_views (bool show) boost::shared_ptr t ( new AutomationTimeAxisView (_session, - _route, _route->panner(), pan_control, + _route, + _route->pannable(), + pan_control, + pan_control->parameter (), _editor, *this, false, @@ -257,17 +261,8 @@ AudioTimeAxisView::update_gain_track_visibility () { bool const showit = gain_automation_item->get_active(); - if (showit != gain_track->marked_for_display()) { - if (showit) { - gain_track->set_marked_for_display (true); - gain_track->canvas_display()->show(); - gain_track->canvas_background()->show(); - gain_track->get_state_node()->add_property ("shown", X_("yes")); - } else { - gain_track->set_marked_for_display (false); - gain_track->hide (); - gain_track->get_state_node()->add_property ("shown", X_("no")); - } + if (showit != string_is_affirmative (gain_track->gui_property ("visible"))) { + gain_track->set_marked_for_display (showit); /* now trigger a redisplay */ @@ -281,110 +276,69 @@ 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 (showit != (*i)->marked_for_display()) { - if (showit) { - (*i)->set_marked_for_display (true); - (*i)->canvas_display()->show(); - (*i)->canvas_background()->show(); - (*i)->get_state_node()->add_property ("shown", X_("yes")); - } else { - (*i)->set_marked_for_display (false); - (*i)->hide (); - (*i)->get_state_node()->add_property ("shown", X_("no")); - } - - /* now trigger a redisplay */ - if (!no_redraw) { - _route->gui_changed (X_("visible_tracks"), (void *) 0); /* EMIT_SIGNAL */ - } + if ((*i)->set_marked_for_display (showit)) { + changed = true; } } -} - -void -AudioTimeAxisView::show_all_automation () -{ - no_redraw = true; - - RouteTimeAxisView::show_all_automation (); - - no_redraw = false; - - _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */ -} -void -AudioTimeAxisView::show_existing_automation () -{ - no_redraw = true; - - RouteTimeAxisView::show_existing_automation (); - - no_redraw = false; - - _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */ + if (changed) { + _route->gui_changed (X_("visible_tracks"), (void *) 0); /* EMIT_SIGNAL */ + } } void -AudioTimeAxisView::hide_all_automation () +AudioTimeAxisView::show_all_automation (bool apply_to_selection) { - no_redraw = true; - - RouteTimeAxisView::hide_all_automation(); + if (apply_to_selection) { + _editor.get_selection().tracks.foreach_audio_time_axis (boost::bind (&AudioTimeAxisView::show_all_automation, _1, false)); + } else { - no_redraw = false; - _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */ -} + no_redraw = true; -void -AudioTimeAxisView::show_all_xfades () -{ - AudioStreamView* asv = audio_view(); + RouteTimeAxisView::show_all_automation (); - if (asv) { - asv->show_all_xfades (); + no_redraw = false; + request_redraw (); } } void -AudioTimeAxisView::hide_all_xfades () +AudioTimeAxisView::show_existing_automation (bool apply_to_selection) { - AudioStreamView* asv = audio_view(); + if (apply_to_selection) { + _editor.get_selection().tracks.foreach_audio_time_axis (boost::bind (&AudioTimeAxisView::show_existing_automation, _1, false)); + } else { + no_redraw = true; - if (asv) { - asv->hide_all_xfades (); - } -} + RouteTimeAxisView::show_existing_automation (); -void -AudioTimeAxisView::hide_dependent_views (TimeAxisViewItem& tavi) -{ - AudioStreamView* asv = audio_view(); - AudioRegionView* rv; + no_redraw = false; - if (asv && (rv = dynamic_cast(&tavi)) != 0) { - asv->hide_xfades_involving (*rv); + request_redraw (); } } void -AudioTimeAxisView::reveal_dependent_views (TimeAxisViewItem& tavi) +AudioTimeAxisView::hide_all_automation (bool apply_to_selection) { - AudioStreamView* asv = audio_view(); - AudioRegionView* rv; + if (apply_to_selection) { + _editor.get_selection().tracks.foreach_audio_time_axis (boost::bind (&AudioTimeAxisView::hide_all_automation, _1, false)); + } else { + no_redraw = true; - if (asv && (rv = dynamic_cast(&tavi)) != 0) { - asv->reveal_xfades_involving (*rv); + RouteTimeAxisView::hide_all_automation(); + + no_redraw = false; + request_redraw (); } } void AudioTimeAxisView::route_active_changed () { - RouteTimeAxisView::route_active_changed (); update_control_names (); } @@ -424,44 +378,44 @@ AudioTimeAxisView::update_control_names () } void -AudioTimeAxisView::build_automation_action_menu () +AudioTimeAxisView::build_automation_action_menu (bool for_selection) { using namespace Menu_Helpers; - RouteTimeAxisView::build_automation_action_menu (); + 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 (gain_track->marked_for_display ()); + 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 (_("Pan"), sigc::mem_fun (*this, &AudioTimeAxisView::update_pan_track_visibility))); - pan_automation_item = dynamic_cast (&automation_items.back ()); - pan_automation_item->set_active (pan_tracks.front()->marked_for_display ()); + 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->panner()->what_can_be_automated (); + set const & params = _route->pannable()->what_can_be_automated (); for (set::iterator p = params.begin(); p != params.end(); ++p) { _main_automation_menu_map[*p] = pan_automation_item; } } void -AudioTimeAxisView::add_processor_to_subplugin_menu (boost::weak_ptr wp) +AudioTimeAxisView::enter_internal_edit_mode () { - /* we use this override to veto the Amp processor from the plugin menu, - as its automation lane can be accessed using the special "Fader" menu - option - */ - - boost::shared_ptr p = wp.lock (); - if (!p) { - return; - } + if (audio_view()) { + audio_view()->enter_internal_edit_mode (); + } +} - if (boost::dynamic_pointer_cast (p) == 0) { - RouteTimeAxisView::add_processor_to_subplugin_menu (wp); - } +void +AudioTimeAxisView::leave_internal_edit_mode () +{ + if (audio_view()) { + audio_view()->leave_internal_edit_mode (); + } }