X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Faudio_time_axis.cc;h=d06652b648e5483589f3e5f0cf635dda705034b7;hb=5173497c6d9b4bed0f64c1c3b4beab442a405849;hp=f43d3739cc6c3b2084e72b68394554a64139c12d;hpb=75abb09f32c3c4f39e1356bd2caac44182febb02;p=ardour.git diff --git a/gtk2_ardour/audio_time_axis.cc b/gtk2_ardour/audio_time_axis.cc index f43d3739cc..d06652b648 100644 --- a/gtk2_ardour/audio_time_axis.cc +++ b/gtk2_ardour/audio_time_axis.cc @@ -77,10 +77,17 @@ 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) +{ + RouteTimeAxisView::set_route (rt); + // Make sure things are sane... assert(!is_track() || is_audio_track()); @@ -99,17 +106,13 @@ AudioTimeAxisView::AudioTimeAxisView (PublicEditor& ed, Session* sess, boost::sh 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_shell()->Changed.connect (*this, invalidator (*this), + _route->panner_shell()->Changed.connect (*this, invalidator (*this), boost::bind (&AudioTimeAxisView::ensure_pan_views, this, false), gui_context()); } @@ -156,18 +159,14 @@ 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 (); } @@ -181,8 +180,8 @@ AudioTimeAxisView::append_extra_display_menu_items () // crossfade stuff if (!Profile->get_sae() && is_track ()) { - 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))); + items.push_back (MenuElem (_("Hide All Crossfades"), sigc::bind (sigc::mem_fun(*this, &AudioTimeAxisView::hide_all_xfades), true))); + items.push_back (MenuElem (_("Show All Crossfades"), sigc::bind (sigc::mem_fun(*this, &AudioTimeAxisView::show_all_xfades), true))); items.push_back (SeparatorElem ()); } } @@ -190,6 +189,29 @@ AudioTimeAxisView::append_extra_display_menu_items () void AudioTimeAxisView::create_automation_child (const Evoral::Parameter& param, bool show) { + if (param.type() == NullAutomation) { + cerr << "WARNING: Attempt to create NullAutomation child, ignoring" << endl; + return; + } + + 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 (); + } + + return; + } + if (param.type() == GainAutomation) { create_gain_automation_child (param, show); @@ -198,11 +220,10 @@ AudioTimeAxisView::create_automation_child (const Evoral::Parameter& param, bool param.type() == PanElevationAutomation || param.type() == PanAzimuthAutomation) { - ensure_xml_node (); ensure_pan_views (show); } else if (param.type() == PluginAutomation) { - + /* handled elsewhere */ } else { @@ -241,8 +262,8 @@ AudioTimeAxisView::ensure_pan_views (bool show) boost::shared_ptr t ( new AutomationTimeAxisView (_session, - _route, - _route->pannable(), + _route, + _route->pannable(), pan_control, pan_control->parameter (), _editor, @@ -263,17 +284,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 */ @@ -287,81 +299,89 @@ 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; } } + + if (changed) { + _route->gui_changed (X_("visible_tracks"), (void *) 0); /* EMIT_SIGNAL */ + } } void -AudioTimeAxisView::show_all_automation () +AudioTimeAxisView::show_all_automation (bool apply_to_selection) { - no_redraw = true; + if (apply_to_selection) { + _editor.get_selection().tracks.foreach_audio_time_axis (boost::bind (&AudioTimeAxisView::show_all_automation, _1, false)); + } else { - RouteTimeAxisView::show_all_automation (); + no_redraw = true; - no_redraw = false; + RouteTimeAxisView::show_all_automation (); - _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */ + no_redraw = false; + request_redraw (); + } } void -AudioTimeAxisView::show_existing_automation () +AudioTimeAxisView::show_existing_automation (bool apply_to_selection) { - no_redraw = true; + if (apply_to_selection) { + _editor.get_selection().tracks.foreach_audio_time_axis (boost::bind (&AudioTimeAxisView::show_existing_automation, _1, false)); + } else { + no_redraw = true; - RouteTimeAxisView::show_existing_automation (); + RouteTimeAxisView::show_existing_automation (); - no_redraw = false; + no_redraw = false; - _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */ + request_redraw (); + } } void -AudioTimeAxisView::hide_all_automation () +AudioTimeAxisView::hide_all_automation (bool apply_to_selection) { - no_redraw = true; + if (apply_to_selection) { + _editor.get_selection().tracks.foreach_audio_time_axis (boost::bind (&AudioTimeAxisView::hide_all_automation, _1, false)); + } else { + no_redraw = true; - RouteTimeAxisView::hide_all_automation(); + RouteTimeAxisView::hide_all_automation(); - no_redraw = false; - _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */ + no_redraw = false; + request_redraw (); + } } void -AudioTimeAxisView::show_all_xfades () +AudioTimeAxisView::show_all_xfades (bool apply_to_selection) { - AudioStreamView* asv = audio_view(); - - if (asv) { - asv->show_all_xfades (); + if (apply_to_selection) { + _editor.get_selection().tracks.foreach_audio_time_axis (boost::bind (&AudioTimeAxisView::show_all_xfades, _1, false)); + } else { + AudioStreamView* asv = audio_view (); + if (asv) { + asv->show_all_xfades (); + } } } void -AudioTimeAxisView::hide_all_xfades () +AudioTimeAxisView::hide_all_xfades (bool apply_to_selection) { - AudioStreamView* asv = audio_view(); - - if (asv) { - asv->hide_all_xfades (); + if (apply_to_selection) { + _editor.get_selection().tracks.foreach_audio_time_axis (boost::bind (&AudioTimeAxisView::hide_all_xfades, _1, false)); + } else { + AudioStreamView* asv = audio_view (); + if (asv) { + asv->hide_all_xfades (); + } } } @@ -390,7 +410,6 @@ AudioTimeAxisView::reveal_dependent_views (TimeAxisViewItem& tavi) void AudioTimeAxisView::route_active_changed () { - RouteTimeAxisView::route_active_changed (); update_control_names (); } @@ -430,23 +449,25 @@ 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->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->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::iterator p = params.begin(); p != params.end(); ++p) { @@ -455,19 +476,17 @@ AudioTimeAxisView::build_automation_action_menu () } 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 (); + } }