Restore Fader and Pan options to audio track automation menus. Hide the Amp processo...

[ardour.git] / gtk2_ardour / ardour_ui_dependents.cc

diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc
index 9a9a575e73b11d5628d3daf637b2a0292e48b173..fb5757a8092043646c70a259c62577dce115f64c 100644 (file)
--- a/gtk2_ardour/ardour_ui_dependents.cc
+++ b/gtk2_ardour/ardour_ui_dependents.cc
@@ -36,7 +36,6 @@
 #include "opts.h"
 #include "i18n.h"
 
-using namespace sigc;
 using namespace Gtk;
 using namespace PBD;
 
@@ -58,19 +57,18 @@ ARDOUR_UI::we_have_dependents ()
 {
        install_actions ();
        ProcessorBox::register_actions ();
-
-       Keyboard::setup_keybindings ();
-
-       editor->UpdateAllTransportClocks.connect (mem_fun (*this, &ARDOUR_UI::update_transport_clocks));
+       keyboard->setup_keybindings ();
+       editor->setup_tooltips ();
+       editor->UpdateAllTransportClocks.connect (sigc::mem_fun (*this, &ARDOUR_UI::update_transport_clocks));
 }
 
 void
 ARDOUR_UI::connect_dependents_to_session (ARDOUR::Session *s)
 {
        BootMessage (_("Setup Editor"));
-       editor->connect_to_session (s);
+       editor->set_session (s);
        BootMessage (_("Setup Mixer"));
-       mixer->connect_to_session (s);
+       mixer->set_session (s);
 
        /* its safe to do this now */
 
@@ -90,7 +88,7 @@ ARDOUR_UI::goto_editor_window ()
 {
        if (splash && splash->is_visible()) {
                // in 2 seconds, hide the splash screen
-               Glib::signal_timeout().connect (bind (sigc::ptr_fun (_hide_splash), this), 2000);
+               Glib::signal_timeout().connect (sigc::bind (sigc::ptr_fun (_hide_splash), this), 2000);
        }
 
        editor->show_window ();
@@ -132,3 +130,4 @@ ARDOUR_UI::exit_on_main_window_close (GdkEventAny * /*ev*/)
        return TRUE;
 #endif
 }
+