mackie: substantial reworking of flip mode with large chunks of code no longer used.

[ardour.git] / gtk2_ardour / meterbridge.cc

diff --git a/gtk2_ardour/meterbridge.cc b/gtk2_ardour/meterbridge.cc
index 08604b062021964ff91f40c14f1d1254bf7eba19..1a320fa6c27085dec6615333bccec54d2501df37 100644 (file)
--- a/gtk2_ardour/meterbridge.cc
+++ b/gtk2_ardour/meterbridge.cc
@@ -52,7 +52,6 @@
 #include "route_sorter.h"
 #include "actions.h"
 #include "gui_thread.h"
-#include "global_signals.h"
 #include "meter_patterns.h"
 #include "timers.h"
 
@@ -111,7 +110,6 @@ Meterbridge::Meterbridge ()
        assert(max_height % 16 == 0);
        set_geometry_hints(*((Gtk::Window*) this), geom, Gdk::HINT_MIN_SIZE | Gdk::HINT_MAX_SIZE | Gdk::HINT_RESIZE_INC);
 
-       set_keep_above (true);
        set_border_width (0);
 
        metrics_vpacker_left.pack_start (metrics_left, true, true);
@@ -175,8 +173,8 @@ Meterbridge::Meterbridge ()
        viewport->set_border_width(0);
 
        UI::instance()->theme_changed.connect (sigc::mem_fun(*this, &Meterbridge::on_theme_changed));
-       ColorsChanged.connect (sigc::mem_fun (*this, &Meterbridge::on_theme_changed));
-       DPIReset.connect (sigc::mem_fun (*this, &Meterbridge::on_theme_changed));
+       UIConfiguration::instance().ColorsChanged.connect (sigc::mem_fun (*this, &Meterbridge::on_theme_changed));
+       UIConfiguration::instance().DPIReset.connect (sigc::mem_fun (*this, &Meterbridge::on_theme_changed));
 }
 
 Meterbridge::~Meterbridge ()
@@ -439,7 +437,7 @@ Meterbridge::set_session (Session* s)
 
        if (_visible) {
                show_window();
-               ActionManager::check_toggleaction ("<Actions>/Common/toggle-meterbridge");
+               present ();
        }
        start_updating ();
 }