X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Flevel_meter.cc;h=217af7783d055062a549d93d046795976d02a4db;hb=3b079064e62facf91a35d2307709fc00feb0bb19;hp=679c5ac2b5163d0ffe8ef6b58d3a82691b67ef09;hpb=f450df300c9c057141a4caf79ff6dbfbf58492d9;p=ardour.git

diff --git a/gtk2_ardour/level_meter.cc b/gtk2_ardour/level_meter.cc
index 679c5ac2b5..217af7783d 100644
--- a/gtk2_ardour/level_meter.cc
+++ b/gtk2_ardour/level_meter.cc
@@ -26,12 +26,12 @@
 
 #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"
 
 #include "ardour_ui.h"
+#include "global_signals.h"
 #include "level_meter.h"
 #include "utils.h"
 #include "logmeter.h"
@@ -59,7 +59,7 @@ LevelMeter::LevelMeter (Session* s)
 {
 	set_session (s);
 	set_spacing (1);
-	Config->ParameterChanged.connect (_parameter_connection, ui_bind (&LevelMeter::parameter_changed, this, _1), gui_context());
+	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();
@@ -85,7 +85,7 @@ LevelMeter::set_meter (PeakMeter* meter)
 	_meter = meter;
 
 	if (_meter) {
-		_meter->ConfigurationChanged.connect (_configuration_connection, ui_bind (&LevelMeter::configuration_changed, this, _1, _2), gui_context());
+		_meter->ConfigurationChanged.connect (_configuration_connection, invalidator (*this), ui_bind (&LevelMeter::configuration_changed, this, _1, _2), gui_context());
 	}
 }
 
@@ -186,9 +186,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();