HIG-ify the locations UI a bit. Should fix #3526.

[ardour.git] / gtk2_ardour / level_meter.cc

diff --git a/gtk2_ardour/level_meter.cc b/gtk2_ardour/level_meter.cc
index 392aec20bfdcf83b2f1eb046a1554703f3c77c4c..e282b074853ddb55a33cd0dc138a25d86346cdec 100644 (file)
--- a/gtk2_ardour/level_meter.cc
+++ b/gtk2_ardour/level_meter.cc
@@ -26,7 +26,6 @@
 
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/fastmeter.h>
-#include <gtkmm2ext/stop_signal.h>
 #include <gtkmm2ext/barcontroller.h>
 #include "midi++/manager.h"
 #include "pbd/fastlog.h"
@@ -47,22 +46,21 @@ using namespace ARDOUR;
 using namespace PBD;
 using namespace Gtkmm2ext;
 using namespace Gtk;
-using namespace sigc;
 using namespace std;
 
 //sigc::signal<void> LevelMeter::ResetAllPeakDisplays;
 //sigc::signal<void,RouteGroup*> LevelMeter::ResetGroupPeakDisplays;
 
 
-LevelMeter::LevelMeter (Session& s)
-       : _session (s)
-       , _meter (0)
+LevelMeter::LevelMeter (Session* s)
+       : _meter (0)
        , meter_length (0)
 {
+       set_session (s);
        set_spacing (1);
-       Config->ParameterChanged.connect (mem_fun (*this, &LevelMeter::parameter_changed));
-       UI::instance()->theme_changed.connect (mem_fun(*this, &LevelMeter::on_theme_changed));
-       ColorsChanged.connect (mem_fun (*this, &LevelMeter::color_handler));
+       Config->ParameterChanged.connect (_parameter_connection, invalidator (*this), ui_bind (&LevelMeter::parameter_changed, this, _1), gui_context());
+       UI::instance()->theme_changed.connect (sigc::mem_fun(*this, &LevelMeter::on_theme_changed));
+       ColorsChanged.connect (sigc::mem_fun (*this, &LevelMeter::color_handler));
        max_peak = minus_infinity();
 }
 
@@ -84,9 +82,9 @@ LevelMeter::set_meter (PeakMeter* meter)
 {
        _configuration_connection.disconnect();
        _meter = meter;
+
        if (_meter) {
-               _configuration_connection = _meter->ConfigurationChanged.connect(
-                       mem_fun(*this, &LevelMeter::configuration_changed));
+               _meter->ConfigurationChanged.connect (_configuration_connection, invalidator (*this), ui_bind (&LevelMeter::configuration_changed, this, _1, _2), gui_context());
        }
 }
 
@@ -120,7 +118,7 @@ LevelMeter::update_meters ()
 void
 LevelMeter::parameter_changed (string p)
 {
-       ENSURE_GUI_THREAD (bind (mem_fun(*this, &LevelMeter::parameter_changed), p));
+       ENSURE_GUI_THREAD (*this, &LevelMeter::parameter_changed, p)
 
        if (p == "meter-hold") {
 
@@ -187,9 +185,9 @@ LevelMeter::setup_meters (int len, int initial_width)
        for (int32_t n = nmeters-1; nmeters && n >= 0 ; --n) {
                uint32_t b, m, t, c;
                if (n < nmidi) {
-                       b = ARDOUR_UI::config()->canvasvar_MidiNoteMeterColorBase.get();
-                       m = ARDOUR_UI::config()->canvasvar_MidiNoteMeterColorMid.get();
-                       t = ARDOUR_UI::config()->canvasvar_MidiNoteMeterColorTop.get();
+                       b = ARDOUR_UI::config()->canvasvar_MidiMeterColorBase.get();
+                       m = ARDOUR_UI::config()->canvasvar_MidiMeterColorMid.get();
+                       t = ARDOUR_UI::config()->canvasvar_MidiMeterColorTop.get();
                        c = ARDOUR_UI::config()->canvasvar_MeterColorClip.get();
                } else {
                        b = ARDOUR_UI::config()->canvasvar_MeterColorBase.get();
@@ -204,7 +202,7 @@ LevelMeter::setup_meters (int len, int initial_width)
                        meters[n].width = width;
                        meters[n].length = len;
                        meters[n].meter->add_events (Gdk::BUTTON_RELEASE_MASK);
-                       meters[n].meter->signal_button_release_event().connect (bind (mem_fun(*this, &LevelMeter::meter_button_release), n));
+                       meters[n].meter->signal_button_release_event().connect (sigc::bind (sigc::mem_fun(*this, &LevelMeter::meter_button_release), n));
                }
 
                pack_end (*meters[n].meter, false, false);