diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-12-23 15:35:49 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-12-23 15:35:49 -0500 |
| commit | 84f55440a3c6317dd2ab5d7e3d638016609e4d03 (patch) | |
| tree | 2329f57523432a698f99927a2f070555fd31fe20 /gtk2_ardour/level_meter.cc | |
| parent | e1bca03857070ba390bba729933c2d72ad5169fd (diff) | |
| parent | dc7878760da040ad74b077318d2e9868d427199a (diff) | |
fix redrawing of canvas with an optimized build
Best guess right now is that optimization does something bad when ceil() is called twice on a very large dbl-precision number,
which results in a zero (empty) redraw area. Without the removal of the redundant ceil & floor functions, no expose events
would be delivered to the canvas in an optimized build during drags (and maybe more).
Diffstat (limited to 'gtk2_ardour/level_meter.cc')
| -rw-r--r-- | gtk2_ardour/level_meter.cc | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/gtk2_ardour/level_meter.cc b/gtk2_ardour/level_meter.cc index 194e446115..e428958343 100644 --- a/gtk2_ardour/level_meter.cc +++ b/gtk2_ardour/level_meter.cc @@ -157,6 +157,8 @@ LevelMeterBase::update_meters () (*i).meter->set (meter_deflect_ppm (peak + meter_lineup(0))); } else if (meter_type == MeterVU) { (*i).meter->set (meter_deflect_vu (peak + vu_standard() + meter_lineup(0))); + } else if (meter_type == MeterK12) { + (*i).meter->set (meter_deflect_k (peak, 12), meter_deflect_k(_meter->meter_level(n, MeterPeak), 12)); } else if (meter_type == MeterK14) { (*i).meter->set (meter_deflect_k (peak, 14), meter_deflect_k(_meter->meter_level(n, MeterPeak), 14)); } else if (meter_type == MeterK20) { @@ -320,6 +322,17 @@ LevelMeterBase::setup_meters (int len, int initial_width, int thin_width) c[6] = c[7] = 0xffff00ff; c[8] = c[9] = 0xff0000ff; break; + case MeterK12: + stp[0] = 115.0 * meter_deflect_k(-32, 12); //-20 + stp[1] = 115.0 * meter_deflect_k(-12, 12); // 0 + stp[2] = 115.0 * meter_deflect_k(-10, 12); // +2 + stp[3] = 115.0 * meter_deflect_k( -8, 12); // +4 + c[0] = c[1] = 0x008800ff; + c[2] = c[3] = 0x00ff00ff; + c[4] = c[5] = 0xffff00ff; + c[6] = c[7] = 0xffff00ff; + c[8] = c[9] = 0xff0000ff; + 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"); |