summaryrefslogtreecommitdiff
path: root/gtk2_ardour/level_meter.cc
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2013-07-27 21:26:22 +0200
committerRobin Gareus <robin@gareus.org>2013-07-27 21:26:22 +0200
commit362e774878b8c417cee509a202bd23c5826bfa3f (patch)
treecc623f44ec7e896eb898962b85940cc41084e8a5 /gtk2_ardour/level_meter.cc
parent40d3bb75848d280293deb38ac70ef26e3884dd14 (diff)
update meter marks and colors..
Diffstat (limited to 'gtk2_ardour/level_meter.cc')
-rw-r--r--gtk2_ardour/level_meter.cc25
1 files changed, 16 insertions, 9 deletions
diff --git a/gtk2_ardour/level_meter.cc b/gtk2_ardour/level_meter.cc
index 29e110d1d8..dc3a20d5af 100644
--- a/gtk2_ardour/level_meter.cc
+++ b/gtk2_ardour/level_meter.cc
@@ -316,22 +316,29 @@ LevelMeterBase::setup_meters (int len, int initial_width, int thin_width)
c[0] = c[1] = c[2] = c[3] = c[4] = c[5] = c[6] = c[7] = c[8] = c[9] = 0xaaaaaaff;
break;
case MeterIEC2EBU:
- stp[0] = 115.0 * meter_deflect_ppm(-18);
- stp[1] = 115.0 * meter_deflect_ppm(-14);
- stp[2] = 115.0 * meter_deflect_ppm(-10);
- stp[3] = 115.0 * meter_deflect_ppm( -8);
+ stp[0] = 115.0 * meter_deflect_ppm(-24); // ignored
+ stp[1] = 115.0 * meter_deflect_ppm(-18);
+ stp[2] = 115.0 * meter_deflect_ppm( -9);
+ stp[3] = 115.0 * meter_deflect_ppm( 0); // ignored
+ c[3] = c[2] = c[1];
+ c[6] = c[7] = c[8] = c[9];
break;
case MeterIEC1NOR:
- stp[0] = 115.0 * meter_deflect_nordic(-18);
- stp[1] = 115.0 * meter_deflect_nordic(-15);
+ stp[0] = 115.0 * meter_deflect_nordic(-30); // ignored
+ stp[1] = 115.0 * meter_deflect_nordic(-18);
stp[2] = 115.0 * meter_deflect_nordic(-12);
- stp[3] = 115.0 * meter_deflect_nordic( -9);
+ stp[3] = 115.0 * meter_deflect_nordic( -9); // ignored
+ c[1] = c[2] = c[3];
+ c[6] = c[7] = c[8] = c[9];
break;
case MeterIEC1DIN:
- stp[0] = 115.0 * meter_deflect_din(-29);
+ stp[0] = 115.0 * meter_deflect_din(-29); // ignored
stp[1] = 115.0 * meter_deflect_din(-18);
- stp[2] = 115.0 * meter_deflect_din(-15);
+ 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[4] = c[6];
+ c[5] = c[7];
break;
case MeterVU:
stp[0] = 115.0 * meter_deflect_vu(-26); // -6