ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

un-hardcode DIN & VU meter-colors,

This commit is contained in:
Robin Gareus 2014-09-26 16:10:06 +02:00
parent 2a53154892
commit fb0de10b93
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk2_ardour/default_ui_config.in
View File

@ -64,7 +64,7 @@
<Option name="measure line beat" value="a29e9e76"/>
<Option name="meter bar" value="626470cc"/>
<Option name="meter fill: 0" value="008800ff"/>
<Option name="meter fill: 1" value="008800ff"/>
<Option name="meter fill: 1" value="00aa00ff"/>
<Option name="meter fill: 2" value="00ff00ff"/>
<Option name="meter fill: 3" value="00ff00ff"/>
<Option name="meter fill: 4" value="fff000ff"/>

7
gtk2_ardour/level_meter.cc
View File

@ -355,7 +355,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;
@ -364,7 +363,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;
@ -373,8 +372,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)