show VCA master mute state in RouteUI, even if Config->get_show_solo_mutes() is false...

[ardour.git] / gtk2_ardour / route_params_ui.cc

diff --git a/gtk2_ardour/route_params_ui.cc b/gtk2_ardour/route_params_ui.cc
index f1677c4c2a44375218bdea2859213a586d9594c2..19e2aa17ff0dc24bf173013f0c8f9f36d3cd0c70 100644 (file)
--- a/gtk2_ardour/route_params_ui.cc
+++ b/gtk2_ardour/route_params_ui.cc
@@ -46,6 +46,7 @@
 #include "return_ui.h"
 #include "route_params_ui.h"
 #include "send_ui.h"
+#include "timers.h"
 
 #include "i18n.h"
 
@@ -251,7 +252,7 @@ RouteParams_UI::setup_processor_boxes()
                }
                redir_hpane.pack1 (*insert_box);
 
-               insert_box->ProcessorSelected.connect (sigc::mem_fun(*this, &RouteParams_UI::redirect_selected));
+               insert_box->ProcessorSelected.connect (sigc::mem_fun(*this, &RouteParams_UI::redirect_selected));  //note:  this indicates a double-click activation, not just a "selection"
                insert_box->ProcessorUnselected.connect (sigc::mem_fun(*this, &RouteParams_UI::redirect_selected));
 
                redir_hpane.show_all();
@@ -520,8 +521,7 @@ RouteParams_UI::show_track_menu()
                track_menu = new Menu;
                track_menu->set_name ("ArdourContextMenu");
                track_menu->items().push_back
-                               (MenuElem (_("Add Track or Bus"),
-                                          sigc::bind (sigc::mem_fun (*(ARDOUR_UI::instance()), &ARDOUR_UI::add_route), (Gtk::Window*) 0)));
+                               (MenuElem (_("Add Track or Bus"), sigc::mem_fun (*(ARDOUR_UI::instance()), &ARDOUR_UI::add_route)));
        }
        track_menu->popup (1, gtk_get_current_event_time());
 }
@@ -642,7 +642,7 @@ RouteParams_UI::update_title ()
 void
 RouteParams_UI::start_updating ()
 {
-       update_connection = ARDOUR_UI::instance()->RapidScreenUpdate.connect
+       update_connection = Timers::rapid_connect
                (sigc::mem_fun(*this, &RouteParams_UI::update_views));
 }