From: Robin Gareus <robin@gareus.org>
Date: Wed, 24 Jul 2013 14:15:06 +0000 (+0200)
Subject: fix display-type of editor-mixer level-meter
X-Git-Tag: 3.4~153
X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=2ca3329c1084451feacd724e5411f06222de9f1b;p=ardour.git

fix display-type of editor-mixer level-meter
---

diff --git a/gtk2_ardour/level_meter.cc b/gtk2_ardour/level_meter.cc
index d57481b701..f0562ea716 100644
--- a/gtk2_ardour/level_meter.cc
+++ b/gtk2_ardour/level_meter.cc
@@ -361,7 +361,7 @@ LevelMeter::setup_meters (int len, int initial_width, int thin_width)
 				}
 			}
 		}
-		if (meters[n].width != width || meters[n].length != len || color_changed) {
+		if (meters[n].width != width || meters[n].length != len || color_changed || meter_type != visible_meter_type) {
 			delete meters[n].meter;
 			meters[n].meter = new FastMeter ((uint32_t) floor (Config->get_meter_hold()), width, FastMeter::Vertical, len,
 					c[0], c[1], c[2], c[3], c[4],
@@ -383,6 +383,7 @@ LevelMeter::setup_meters (int len, int initial_width, int thin_width)
 	}
 	show();
 	color_changed = false;
+	visible_meter_type = meter_type;
 }
 
 void
diff --git a/gtk2_ardour/level_meter.h b/gtk2_ardour/level_meter.h
index ead63aa50b..d3fd4f9bbd 100644
--- a/gtk2_ardour/level_meter.h
+++ b/gtk2_ardour/level_meter.h
@@ -101,6 +101,7 @@ class LevelMeter : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 	std::vector<MeterInfo> meters;
 	float                  max_peak;
 	ARDOUR::MeterType      meter_type;
+	ARDOUR::MeterType      visible_meter_type;
 
 	PBD::ScopedConnection _configuration_connection;
 	PBD::ScopedConnection _meter_type_connection;