X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Flevel_meter.cc;h=13d0f6187ddb3914f9c20d6b65bdcd3d152b2e67;hb=5fef65538040fbac1b9edd1847a269aa925a49c9;hp=e428958343b7512d1cfe6583074c99bb706d0cf1;hpb=8f930477be9e2c88859a8ea30b213fba3f7fc443;p=ardour.git

diff --git a/gtk2_ardour/level_meter.cc b/gtk2_ardour/level_meter.cc
index e428958343..13d0f6187d 100644
--- a/gtk2_ardour/level_meter.cc
+++ b/gtk2_ardour/level_meter.cc
@@ -22,7 +22,6 @@
 #include "ardour/meter.h"
 
 #include <gtkmm2ext/utils.h>
-#include <gtkmm2ext/barcontroller.h>
 #include "pbd/fastlog.h"
 
 #include "ardour_ui.h"
@@ -37,6 +36,7 @@
 #include "i18n.h"
 
 using namespace ARDOUR;
+using namespace ARDOUR_UI_UTILS;
 using namespace PBD;
 using namespace Gtkmm2ext;
 using namespace Gtk;
@@ -66,9 +66,13 @@ LevelMeterBase::on_theme_changed()
 
 LevelMeterBase::~LevelMeterBase ()
 {
+	_configuration_connection.disconnect();
+	_meter_type_connection.disconnect();
+	_parameter_connection.disconnect();
 	for (vector<MeterInfo>::iterator i = meters.begin(); i != meters.end(); i++) {
 		delete (*i).meter;
 	}
+	meters.clear();
 }
 
 void
@@ -78,6 +82,7 @@ LevelMeterBase::set_meter (PeakMeter* meter)
 	_meter_type_connection.disconnect();
 
 	_meter = meter;
+	color_changed = true;
 
 	if (_meter) {
 		_meter->ConfigurationChanged.connect (_configuration_connection, parent_invalidator, boost::bind (&LevelMeterBase::configuration_changed, this, _1, _2), gui_context());
@@ -268,36 +273,36 @@ LevelMeterBase::setup_meters (int len, int initial_width, int thin_width)
 		uint32_t b[4];
 		float stp[4];
 		int styleflags = Config->get_meter_style_led() ? 3 : 1;
-		b[0] = ARDOUR_UI::config()->get_canvasvar_MeterBackgroundBot();
-		b[1] = ARDOUR_UI::config()->get_canvasvar_MeterBackgroundTop();
+		b[0] = ARDOUR_UI::config()->color ("meter background bottom");
+		b[1] = ARDOUR_UI::config()->color ("meter background top");
 		b[2] = 0x991122ff; // red highlight gradient Bot
 		b[3] = 0x551111ff; // red highlight gradient Top
 		if (n < nmidi) {
-			c[0] = ARDOUR_UI::config()->get_canvasvar_MidiMeterColor0();
-			c[1] = ARDOUR_UI::config()->get_canvasvar_MidiMeterColor1();
-			c[2] = ARDOUR_UI::config()->get_canvasvar_MidiMeterColor2();
-			c[3] = ARDOUR_UI::config()->get_canvasvar_MidiMeterColor3();
-			c[4] = ARDOUR_UI::config()->get_canvasvar_MidiMeterColor4();
-			c[5] = ARDOUR_UI::config()->get_canvasvar_MidiMeterColor5();
-			c[6] = ARDOUR_UI::config()->get_canvasvar_MidiMeterColor6();
-			c[7] = ARDOUR_UI::config()->get_canvasvar_MidiMeterColor7();
-			c[8] = ARDOUR_UI::config()->get_canvasvar_MidiMeterColor8();
-			c[9] = ARDOUR_UI::config()->get_canvasvar_MidiMeterColor9();
+			c[0] = ARDOUR_UI::config()->color ("midi meter color0");
+			c[1] = ARDOUR_UI::config()->color ("midi meter color1");
+			c[2] = ARDOUR_UI::config()->color ("midi meter color2");
+			c[3] = ARDOUR_UI::config()->color ("midi meter color3");
+			c[4] = ARDOUR_UI::config()->color ("midi meter color4");
+			c[5] = ARDOUR_UI::config()->color ("midi meter color5");
+			c[6] = ARDOUR_UI::config()->color ("midi meter color6");
+			c[7] = ARDOUR_UI::config()->color ("midi meter color7");
+			c[8] = ARDOUR_UI::config()->color ("midi meter color8");
+			c[9] = ARDOUR_UI::config()->color ("midi meter color9");
 			stp[0] = 115.0 *  32.0 / 128.0;
 			stp[1] = 115.0 *  64.0 / 128.0;
 			stp[2] = 115.0 * 100.0 / 128.0;
 			stp[3] = 115.0 * 112.0 / 128.0;
 		} else {
-			c[0] = ARDOUR_UI::config()->get_canvasvar_MeterColor0();
-			c[1] = ARDOUR_UI::config()->get_canvasvar_MeterColor1();
-			c[2] = ARDOUR_UI::config()->get_canvasvar_MeterColor2();
-			c[3] = ARDOUR_UI::config()->get_canvasvar_MeterColor3();
-			c[4] = ARDOUR_UI::config()->get_canvasvar_MeterColor4();
-			c[5] = ARDOUR_UI::config()->get_canvasvar_MeterColor5();
-			c[6] = ARDOUR_UI::config()->get_canvasvar_MeterColor6();
-			c[7] = ARDOUR_UI::config()->get_canvasvar_MeterColor7();
-			c[8] = ARDOUR_UI::config()->get_canvasvar_MeterColor8();
-			c[9] = ARDOUR_UI::config()->get_canvasvar_MeterColor9();
+			c[0] = ARDOUR_UI::config()->color ("meter color0");
+			c[1] = ARDOUR_UI::config()->color ("meter color1");
+			c[2] = ARDOUR_UI::config()->color ("meter color2");
+			c[3] = ARDOUR_UI::config()->color ("meter color3");
+			c[4] = ARDOUR_UI::config()->color ("meter color4");
+			c[5] = ARDOUR_UI::config()->color ("meter color5");
+			c[6] = ARDOUR_UI::config()->color ("meter color6");
+			c[7] = ARDOUR_UI::config()->color ("meter color7");
+			c[8] = ARDOUR_UI::config()->color ("meter color8");
+			c[9] = ARDOUR_UI::config()->color ("meter color9");
 
 			switch (meter_type) {
 				case MeterK20:
@@ -335,7 +340,7 @@ LevelMeterBase::setup_meters (int len, int initial_width, int thin_width)
 					break;
 				case MeterIEC2BBC:
 					c[0] = c[1] = c[2] = c[3] = c[4] = c[5] = c[6] = c[7] = c[8] = c[9] =
-						ARDOUR_UI::config()->color_by_name ("meter color BBC");
+						ARDOUR_UI::config()->color ("meter color BBC");
 					stp[0] = stp[1] = stp[2] = stp[3] = 115.0;
 					break;
 				case MeterIEC2EBU:
@@ -351,7 +356,6 @@ LevelMeterBase::setup_meters (int len, int initial_width, int thin_width)
 					stp[1] = 115.0 * meter_deflect_nordic(-18);
 					stp[2] = 115.0 * meter_deflect_nordic(-12);
 					stp[3] = 115.0 * meter_deflect_nordic( -9); // ignored
-					//c[2] = c[3] = c[1]; // dark-green
 					c[0] = c[1] = c[2]; // bright-green
 					c[6] = c[7] = c[8] = c[9];
 					break;
@@ -360,7 +364,7 @@ LevelMeterBase::setup_meters (int len, int initial_width, int thin_width)
 					stp[1] = 115.0 * meter_deflect_din(-18);
 					stp[2] = 115.0 * meter_deflect_din(-15); // ignored
 					stp[3] = 115.0 * meter_deflect_din( -9);
-					c[0] = c[1] = c[2] = c[3] = 0x00aa00ff;
+					c[0] = c[2] = c[3] = c[1];
 					c[4] = c[6];
 					c[5] = c[7];
 					break;
@@ -369,8 +373,8 @@ LevelMeterBase::setup_meters (int len, int initial_width, int thin_width)
 					stp[1] = 115.0 * meter_deflect_vu(-23); // -3
 					stp[2] = 115.0 * meter_deflect_vu(-20); // 0
 					stp[3] = 115.0 * meter_deflect_vu(-18); // +2
-					c[0] = c[1] = c[2] = c[3] = c[4] = c[5] = 0x00aa00ff;
-					c[6] = c[7] = c[8] = c[9] = 0xff8800ff;
+					c[0] = c[2] = c[3] = c[4] = c[5] = c[1];
+					c[7] = c[8] = c[9] = c[6];
 					break;
 				default: // PEAK, RMS
 					stp[1] = 77.5;  // 115 * log_meter(-10)
@@ -408,8 +412,8 @@ LevelMeterBase::setup_meters (int len, int initial_width, int thin_width)
 			meters[n].width = width;
 			meters[n].length = len;
 			meters[n].meter->add_events (Gdk::BUTTON_PRESS_MASK | Gdk::BUTTON_RELEASE_MASK);
-			meters[n].meter->signal_button_press_event().connect (sigc::mem_fun (*this, &LevelMeterBase::meter_button_press));
-			meters[n].meter->signal_button_release_event().connect (sigc::mem_fun (*this, &LevelMeterBase::meter_button_release));
+			meters[n].meter->signal_button_press_event().connect (sigc::mem_fun (*this, &LevelMeterBase::meter_button_press), false);
+			meters[n].meter->signal_button_release_event().connect (sigc::mem_fun (*this, &LevelMeterBase::meter_button_release), false);
 		}
 
 		//pack_end (*meters[n].meter, false, false);
@@ -432,7 +436,7 @@ LevelMeterBase::set_type(MeterType t)
 bool
 LevelMeterBase::meter_button_press (GdkEventButton* ev)
 {
-	return ButtonPress (ev); /* EMIT SIGNAL */
+	return !!ButtonPress (ev); /* EMIT SIGNAL */
 }
 
 bool