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

fix meter scale colors (meterbridge)

This commit is contained in:
Robin Gareus 2014-12-09 19:39:44 +01:00
parent 724febc82c
commit 8e93139872
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtk2_ardour/dark.colors
View File

@ -267,10 +267,10 @@
<ColorAlias name="meterbridge peakindicator: led" alias="color 9"/>
<ColorAlias name="meterbridge peakindicator: led active" alias="color 9"/>
<ColorAlias name="meterbridge peaklabel" alias="color 9"/>
<ColorAlias name="meterstrip dpm fg" alias="color 9"/>
<ColorAlias name="meterstrip ppm fg" alias="color 13"/>
<ColorAlias name="meterstrip dpm fg" alias="color 31"/>
<ColorAlias name="meterstrip ppm fg" alias="color 31"/>
<ColorAlias name="meterstrip vu fg" alias="color 4"/>
<ColorAlias name="meterstrip dpm bg" alias="color 9"/>
<ColorAlias name="meterstrip dpm bg" alias="color 27"/>
<ColorAlias name="meterstrip ppm bg" alias="color 27"/>
<ColorAlias name="meterstrip vu bg" alias="color 32"/>
<ColorAlias name="midi bus base" alias="color 4"/>

13
gtk2_ardour/meter_patterns.cc
View File

@ -236,10 +236,12 @@ static void set_bg_color (Gtk::Widget& w, cairo_t* cr, MeterType type) {
case MeterIEC1NOR:
case MeterIEC2BBC:
case MeterIEC2EBU:
ArdourCanvas::color_to_rgba (ARDOUR_UI::config()->color ("meterstrip ppm bg"), r, g, b, a);
break;
case MeterK12:
case MeterK14:
case MeterK20:
ArdourCanvas::color_to_rgba (ARDOUR_UI::config()->color ("meterstrip ppm bg"), r, g, b, a);
ArdourCanvas::color_to_rgba (ARDOUR_UI::config()->color ("meterstrip dpm bg"), r, g, b, a);
break;
default:
{
@ -258,10 +260,15 @@ static void set_fg_color(Gtk::Widget&, MeterType type, Gdk::Color * c) {
switch(type) {
case MeterVU:
ArdourCanvas::color_to_rgba (ARDOUR_UI::config()->color ("meterstrip vu fg"), r, g, b, a);
break;
case MeterIEC1DIN:
case MeterIEC1NOR:
case MeterIEC2BBC:
case MeterIEC2EBU:
ArdourCanvas::color_to_rgba (ARDOUR_UI::config()->color ("meterstrip ppm fg"), r, g, b, a);
break;
default:
ArdourCanvas::color_to_rgba (ARDOUR_UI::config()->color ("meterstrip vu fg"), r, g, b, a);
ArdourCanvas::color_to_rgba (ARDOUR_UI::config()->color ("meterstrip dpm fg"), r, g, b, a);
break;
}
c->set_rgb_p (r, g, b);