Fix formatting samplecnt_t (aka int64_t aka long long int)

[ardour.git] / gtk2_ardour / route_time_axis.cc

diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc
index f40ee82c7237f204ef9a62e620359fb9ff14427f..6a837120143531a5ab3f96e99dd7037c6a082074 100644 (file)
--- a/gtk2_ardour/route_time_axis.cc
+++ b/gtk2_ardour/route_time_axis.cc
@@ -2100,9 +2100,6 @@ RouteTimeAxisView::add_processor_to_subplugin_menu (boost::weak_ptr<Processor> p
 
        items.clear ();
 
-       std::set<Evoral::Parameter> has_visible_automation;
-       AutomationTimeAxisView::what_has_visible_automation (processor, has_visible_automation);
-
        for (std::set<Evoral::Parameter>::const_iterator i = automatable.begin(); i != automatable.end(); ++i) {
 
                ProcessorAutomationNode* pan;
@@ -2119,10 +2116,6 @@ RouteTimeAxisView::add_processor_to_subplugin_menu (boost::weak_ptr<Processor> p
 
                _subplugin_menu_map[*i] = mitem;
 
-               if (has_visible_automation.find((*i)) != has_visible_automation.end()) {
-                       mitem->set_active(true);
-               }
-
                if ((pan = find_processor_automation_node (processor, *i)) == 0) {
 
                        /* new item */
@@ -2137,6 +2130,12 @@ RouteTimeAxisView::add_processor_to_subplugin_menu (boost::weak_ptr<Processor> p
 
                }
 
+               boost::shared_ptr<AutomationTimeAxisView> atav = automation_child (*i);
+               bool visible;
+               if (atav && atav->get_gui_property ("visible", visible)) {
+                       mitem->set_active(true);
+               }
+
                mitem->signal_toggled().connect (sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::processor_menu_item_toggled), rai, pan));
        }