Give group and meter point buttons controllable visibility.
[ardour.git] / gtk2_ardour / audio_time_axis.cc
index 79751145bf5f9f7034e72f2ac3309eb399dc6ae7..d06652b648e5483589f3e5f0cf635dda705034b7 100644 (file)
@@ -77,10 +77,17 @@ using namespace PBD;
 using namespace Gtk;
 using namespace Editing;
 
-AudioTimeAxisView::AudioTimeAxisView (PublicEditor& ed, Session* sess, boost::shared_ptr<Route> 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<Route> 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 ();
 }
 
@@ -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<AutomationTimeAxisView> 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,27 +299,17 @@ void
 AudioTimeAxisView::update_pan_track_visibility ()
 {
        bool const showit = pan_automation_item->get_active();
+       bool changed = false;
 
        for (list<boost::shared_ptr<AutomationTimeAxisView> >::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
@@ -316,14 +318,13 @@ AudioTimeAxisView::show_all_automation (bool apply_to_selection)
        if (apply_to_selection) {
                _editor.get_selection().tracks.foreach_audio_time_axis (boost::bind (&AudioTimeAxisView::show_all_automation, _1, false));
        } else {
-               
+
                no_redraw = true;
-               
+
                RouteTimeAxisView::show_all_automation ();
 
                no_redraw = false;
-               
-               _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */
+               request_redraw ();
        }
 }
 
@@ -334,12 +335,12 @@ AudioTimeAxisView::show_existing_automation (bool 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 ();
-               
+
                no_redraw = false;
-               
-               _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */
+
+               request_redraw ();
        }
 }
 
@@ -350,11 +351,11 @@ AudioTimeAxisView::hide_all_automation (bool 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();
-               
+
                no_redraw = false;
-               _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */
+               request_redraw ();
        }
 }
 
@@ -409,7 +410,6 @@ AudioTimeAxisView::reveal_dependent_views (TimeAxisViewItem& tavi)
 void
 AudioTimeAxisView::route_active_changed ()
 {
-       RouteTimeAxisView::route_active_changed ();
        update_control_names ();
 }
 
@@ -459,13 +459,15 @@ AudioTimeAxisView::build_automation_action_menu (bool for_selection)
 
        automation_items.push_back (CheckMenuElem (_("Fader"), sigc::mem_fun (*this, &AudioTimeAxisView::update_gain_track_visibility)));
        gain_automation_item = dynamic_cast<CheckMenuItem*> (&automation_items.back ());
-       gain_automation_item->set_active (gain_track->marked_for_display () && (!for_selection || _editor.get_selection().tracks.size() == 1));
+       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<CheckMenuItem*> (&automation_items.back ());
-       pan_automation_item->set_active (pan_tracks.front()->marked_for_display () && (!for_selection || _editor.get_selection().tracks.size() == 1));
+       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<Evoral::Parameter> const & params = _route->pannable()->what_can_be_automated ();
        for (set<Evoral::Parameter>::iterator p = params.begin(); p != params.end(); ++p) {
@@ -473,24 +475,6 @@ AudioTimeAxisView::build_automation_action_menu (bool for_selection)
        }
 }
 
-void
-AudioTimeAxisView::add_processor_to_subplugin_menu (boost::weak_ptr<Processor> wp)
-{
-       /* 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<Processor> p = wp.lock ();
-       if (!p) {
-               return;
-       }
-
-       if (boost::dynamic_pointer_cast<Amp> (p) == 0) {
-               RouteTimeAxisView::add_processor_to_subplugin_menu (wp);
-       }
-}
-
 void
 AudioTimeAxisView::enter_internal_edit_mode ()
 {