Visual tweaks to Soundcloud panel

[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..fbfc8c7afd844bd263d7350a320c517c75915a64 100644 (file)
--- a/gtk2_ardour/ardour_ui_dependents.cc
+++ b/gtk2_ardour/ardour_ui_dependents.cc
@@ -17,6 +17,10 @@
 
 */
 
+#ifdef WAF_BUILD
+#include "gtk2ardour-config.h"
+#endif
+
 /* this file exists solely to break compilation dependencies that
    would connect changes to the mixer or editor objects.
 */
@@ -36,7 +40,6 @@
 #include "opts.h"
 #include "i18n.h"
 
-using namespace sigc;
 using namespace Gtk;
 using namespace PBD;
 
@@ -47,30 +50,27 @@ namespace ARDOUR {
 
 using namespace ARDOUR;
 
-void
-ARDOUR_UI::shutdown ()
-{
-       ui_config->save_state();
-}
-
 void
 ARDOUR_UI::we_have_dependents ()
 {
        install_actions ();
        ProcessorBox::register_actions ();
+       keyboard->setup_keybindings ();
+       editor->setup_tooltips ();
+       editor->UpdateAllTransportClocks.connect (sigc::mem_fun (*this, &ARDOUR_UI::update_transport_clocks));
 
-       Keyboard::setup_keybindings ();
-
-       editor->UpdateAllTransportClocks.connect (mem_fun (*this, &ARDOUR_UI::update_transport_clocks));
+       editor->track_mixer_selection ();
+       mixer->track_editor_selection ();
 }
 
 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);
+       meterbridge->set_session (s);
 
        /* its safe to do this now */
 
@@ -78,46 +78,6 @@ ARDOUR_UI::connect_dependents_to_session (ARDOUR::Session *s)
        s->restore_history ("");
 }
 
-static bool
-_hide_splash (gpointer arg)
-{
-       ((ARDOUR_UI*)arg)->hide_splash();
-       return false;
-}
-
-void
-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);
-       }
-
-       editor->show_window ();
-       editor->present ();
-       _mixer_on_top = false;
-       flush_pending ();
-}
-
-void
-ARDOUR_UI::goto_mixer_window ()
-{
-       mixer->show_window ();
-       mixer->present ();
-       _mixer_on_top = true;
-       flush_pending ();
-}
-
-void
-ARDOUR_UI::toggle_editor_mixer_on_top ()
-{
-       if (_mixer_on_top) {
-               goto_editor_window ();
-       } else {
-               goto_mixer_window ();
-       }
-}
-
 /** The main editor window has been closed */
 gint
 ARDOUR_UI::exit_on_main_window_close (GdkEventAny * /*ev*/)
@@ -132,3 +92,4 @@ ARDOUR_UI::exit_on_main_window_close (GdkEventAny * /*ev*/)
        return TRUE;
 #endif
 }
+