VKeybd: Pass on primary (Ctrl/Cmd) shortcuts

[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 eace6de34a0e7d549a72f1c038708b25cf234637..6a837120143531a5ab3f96e99dd7037c6a082074 100644 (file)
--- a/gtk2_ardour/route_time_axis.cc
+++ b/gtk2_ardour/route_time_axis.cc
@@ -49,7 +49,7 @@
 #include "pbd/enumwriter.h"
 #include "pbd/stateful_diff_command.h"
 
-#include "evoral/Parameter.hpp"
+#include "evoral/Parameter.h"
 
 #include "ardour/amp.h"
 #include "ardour/meter.h"
@@ -265,8 +265,7 @@ RouteTimeAxisView::set_route (boost::shared_ptr<Route> rt)
        if (ARDOUR::Profile->get_mixbus()) {
                controls_table.attach (route_group_button, 2, 3, 2, 3, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
                controls_table.attach (gm.get_gain_slider(), 3, 5, 2, 3, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 1, 0);
-       }
-       else if (!ARDOUR::Profile->get_trx()) {
+       } else {
                controls_table.attach (route_group_button, 4, 5, 2, 3, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
                controls_table.attach (gm.get_gain_slider(), 0, 2, 2, 3, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 1, 0);
        }
@@ -293,16 +292,14 @@ RouteTimeAxisView::set_route (boost::shared_ptr<Route> rt)
 
        if (ARDOUR::Profile->get_mixbus()) {
                controls_table.attach (automation_button, 1, 2, 2, 3, Gtk::SHRINK, Gtk::SHRINK);
-       }
-       else if (!ARDOUR::Profile->get_trx()) {
+       } else {
                controls_table.attach (automation_button, 3, 4, 2, 3, Gtk::SHRINK, Gtk::SHRINK);
        }
 
        if (is_track() && track()->mode() == ARDOUR::Normal) {
                if (ARDOUR::Profile->get_mixbus()) {
                        controls_table.attach (playlist_button, 0, 1, 2, 3, Gtk::SHRINK, Gtk::SHRINK);
-               }
-               else if (!ARDOUR::Profile->get_trx()) {
+               } else {
                        controls_table.attach (playlist_button, 2, 3, 2, 3, Gtk::SHRINK, Gtk::SHRINK);
                }
        }
@@ -2103,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;
@@ -2122,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 */
@@ -2140,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));
        }