From d00e035fe0618c8e3f4c87c6386fc87efb58cd62 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Mon, 29 Dec 2014 18:00:24 -0500 Subject: don't unpack and repack meters unnecessarily during LevelMeterBase::setup_meters() --- gtk2_ardour/level_meter.cc | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'gtk2_ardour/level_meter.cc') diff --git a/gtk2_ardour/level_meter.cc b/gtk2_ardour/level_meter.cc index 6ae8c98df1..35a4dd8f31 100644 --- a/gtk2_ardour/level_meter.cc +++ b/gtk2_ardour/level_meter.cc @@ -239,8 +239,6 @@ LevelMeterBase::hide_all_meters () void LevelMeterBase::setup_meters (int len, int initial_width, int thin_width) { - hide_all_meters (); - if (!_meter) { return; /* do it later or never */ } @@ -400,8 +398,13 @@ LevelMeterBase::setup_meters (int len, int initial_width, int thin_width) } if (meters[n].width != width || meters[n].length != len || color_changed || meter_type != visible_meter_type) { bool hl = meters[n].meter ? meters[n].meter->get_highlight() : false; - meters[n].packed = false; - delete meters[n].meter; + + if (meters[n].meter && meters[n].meter->get_parent()) { + mtr_remove (*meters[n].meter); + meters[n].packed = false; + delete meters[n].meter; + } + meters[n].meter = new FastMeter ((uint32_t) floor (ARDOUR_UI::config()->get_meter_hold()), width, _meter_orientation, len, c[0], c[1], c[2], c[3], c[4], c[5], c[6], c[7], c[8], c[9], @@ -415,14 +418,13 @@ LevelMeterBase::setup_meters (int len, int initial_width, int thin_width) 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), 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); - mtr_pack (*meters[n].meter); - meters[n].meter->show_all (); - meters[n].packed = true; + mtr_pack (*meters[n].meter); + meters[n].meter->show_all (); + meters[n].packed = true; + } } - //show(); + color_changed = false; visible_meter_type = meter_type; } -- cgit v1.2.3