diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2014-12-07 15:06:33 -0500 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-12-07 15:06:33 -0500 |
commit | eaa456ff70dd51567ae12e82b15a31bc89b2907f (patch) | |
tree | a52d72b0bc57914098c7fd1923c225d340aaaa9b /gtk2_ardour | |
parent | 66f3de615f17ec6f09591a8d3dd691f7ccbac1b2 (diff) |
the return of correct audio meter colors
Diffstat (limited to 'gtk2_ardour')
-rw-r--r-- | gtk2_ardour/base_colors.h | 15 | ||||
-rw-r--r-- | gtk2_ardour/color_aliases.h | 36 | ||||
-rw-r--r-- | gtk2_ardour/default_ui_config.in | 11 |
3 files changed, 36 insertions, 26 deletions
diff --git a/gtk2_ardour/base_colors.h b/gtk2_ardour/base_colors.h index c52d632ef7..ece842a457 100644 --- a/gtk2_ardour/base_colors.h +++ b/gtk2_ardour/base_colors.h @@ -59,5 +59,16 @@ CANVAS_BASE_COLOR(colorMidGray,"colorMidGray", 0x222222ff) /* midtone */ CANVAS_BASE_COLOR(colorLightGray,"colorLightGray", 0x7f7f7fff) /* light gray */ CANVAS_BASE_COLOR(colorLightest,"colorLightest", 0xffffffff) /* white */ - - +/* Meter colors */ + +CANVAS_BASE_COLOR(MeterColor0, "meterColor0", 0x90FE3BFF) +CANVAS_BASE_COLOR(MeterColor1, "meterColor1", 0x90FE3BFF) +CANVAS_BASE_COLOR(MeterColor2, "meterColor2", 0x90FE3BFF) +CANVAS_BASE_COLOR(MeterColor3, "meterColor3", 0x90FE3BFF) +CANVAS_BASE_COLOR(MeterColor4, "meterColor4", 0xFFEA38ff) +CANVAS_BASE_COLOR(MeterColor5, "meterColor5", 0xFFEA38ff) +CANVAS_BASE_COLOR(MeterColor6, "meterColor6", 0xFFEA38ff) +CANVAS_BASE_COLOR(MeterColor7, "meterColor7", 0xFFEA38ff) +CANVAS_BASE_COLOR(MeterColor8, "meterColor8", 0xFF0000ff) +CANVAS_BASE_COLOR(MeterColor9, "meterColor9", 0xFF0000ff) + diff --git a/gtk2_ardour/color_aliases.h b/gtk2_ardour/color_aliases.h index ad681f6727..e117a02b8d 100644 --- a/gtk2_ardour/color_aliases.h +++ b/gtk2_ardour/color_aliases.h @@ -124,30 +124,18 @@ COLOR_ALIAS(MeasureLineBeat,"measure line beat","color 45") COLOR_ALIAS(MeterBackgroundBot,"meter background: bottom","color 46") COLOR_ALIAS(MeterBackgroundTop,"meter background: top","color 34") COLOR_ALIAS(MeterBar,"meter bar","color 25") -COLOR_ALIAS(MeterBridgeLabelFillActive,"meter color BBC","color 8") -COLOR_ALIAS(MeterBridgeLabelFill,"meter fill: 0","color 47") -COLOR_ALIAS(MeterBridgeLabelLEDActive,"meter fill: 1","color 48") -COLOR_ALIAS(MeterBridgeLabelLED,"meter fill: 2","color 17") -COLOR_ALIAS(MeterBridgeLabelTextActive,"meter fill: 3","color 17") -COLOR_ALIAS(MeterBridgeLabelText,"meter fill: 4","color 32") -COLOR_ALIAS(MeterBridgePeakIndicatorFillActive,"meter fill: 5","color 32") -COLOR_ALIAS(MeterBridgePeakIndicatorFill,"meter fill: 6","color 8") -COLOR_ALIAS(MeterBridgePeakIndicatorLEDActive,"meter fill: 7","color 8") -COLOR_ALIAS(MeterBridgePeakIndicatorLED,"meter fill: 8","color 9") -COLOR_ALIAS(MeterBridgePeakIndicatorTextActive,"meter fill: 9","color 9") -COLOR_ALIAS(MeterBridgePeakIndicatorText,"meter marker","color 19") -COLOR_ALIAS(MeterBridgePeakLabel,"meterbridge label: fill","color 34") -COLOR_ALIAS(MeterColorBBC,"meterbridge label: fill active","color 46") -COLOR_ALIAS(MeterColor0,"meterbridge label: led","color 9") -COLOR_ALIAS(MeterColor1,"meterbridge label: led active","color 9") -COLOR_ALIAS(MeterColor2,"meterbridge label: text","color 26") -COLOR_ALIAS(MeterColor3,"meterbridge label: text active","color 9") -COLOR_ALIAS(MeterColor4,"meterbridge peakindicator: fill","color 34") -COLOR_ALIAS(MeterColor5,"meterbridge peakindicator: fill active","color 9") -COLOR_ALIAS(MeterColor6,"meterbridge peakindicator: led","color 9") -COLOR_ALIAS(MeterColor7,"meterbridge peakindicator: led active","color 9") -COLOR_ALIAS(MeterColor8,"meterbridge peakindicator: text","color 9") -COLOR_ALIAS(MeterColor9,"meterbridge peakindicator: text active","color 9") +COLOR_ALIAS(MeterBridgeLabelFill,"meterbridge label: fill","color 34") +COLOR_ALIAS(MeterBridgeLabelFillActive,"meterbridge label: fill active","color 46") +COLOR_ALIAS(MeterbridgeLabelLED,"meterbridge label: led","color 9") +COLOR_ALIAS(MeterbridgeLabelLEDActive,"meterbridge label: led active","color 9") +COLOR_ALIAS(MeterbridgeLabelText,"meterbridge label: text","color 26") +COLOR_ALIAS(MeterbridgeLabelTextActive,"meterbridge label: text active","color 9") +COLOR_ALIAS(MeterbridgePeakindicatorFill,"meterbridge peakindicator: fill","color 34") +COLOR_ALIAS(MeterbridgePeakindicatorFillActive,"meterbridge peakindicator: fill active","color 9") +COLOR_ALIAS(MeterbridgePeakindicatorLED,"meterbridge peakindicator: led","color 9") +COLOR_ALIAS(MeterbridgePeakindicatorLEDActive,"meterbridge peakindicator: led active","color 9") +COLOR_ALIAS(MeterbridgePeakindicatorText,"meterbridge peakindicator: text","color 9") +COLOR_ALIAS(MeterbridgePeakindicatorTextActive,"meterbridge peakindicator: text active","color 9") COLOR_ALIAS(MeterMarker,"meterbridge peaklabel","color 9") COLOR_ALIAS(MidiBusBase,"midi bus base","color 4") COLOR_ALIAS(MidiDeviceButtonFillActive,"midi device: fill","color 25") diff --git a/gtk2_ardour/default_ui_config.in b/gtk2_ardour/default_ui_config.in index d7e7da5459..111daab2de 100644 --- a/gtk2_ardour/default_ui_config.in +++ b/gtk2_ardour/default_ui_config.in @@ -28,6 +28,17 @@ <Option name="colorDlight" value="0x00b3ffff"/> <Option name="colorDA" value="0x8000ffff"/> + <Option name="meterColor0" value="90FE3BFF"/> + <Option name="meterColor1" value="90FE3BFF"/> + <Option name="meterColor2" value="90FE3BFF"/> + <Option name="meterColor3" value="90FE3BFF"/> + <Option name="meterColor4" value="FFEA38ff"/> + <Option name="meterColor5" value="FFEA38ff"/> + <Option name="meterColor6" value="FFEA38ff"/> + <Option name="meterColor7" value="FFEA38ff"/> + <Option name="meterColor8" value="FF0000ff"/> + <Option name="meterColor9" value="FF0000ff"/> + <Option name="small font" value="@FONT_SMALL@"/> <Option name="smaller font" value="@FONT_SMALLER@"/> <Option name="normal font" value="@FONT_NORMAL@"/> |