diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2014-12-07 16:09:52 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-12-07 16:11:24 -0500 |
| commit | a5e5c14c772b8ca515b7ed75b580aa1dfd1442dc (patch) | |
| tree | 8c0f10e3dbd8fe208d75f083428e6ce7688a5d78 | |
| parent | 95e47d65f4aca43c4d61b1e27c1eff7716c74796 (diff) | |
new code-level defaults for audio peak meter colors
| -rw-r--r-- | gtk2_ardour/base_colors.h | 16 | ||||
| -rw-r--r-- | gtk2_ardour/ui_config.cc | 2 |
2 files changed, 8 insertions, 10 deletions
diff --git a/gtk2_ardour/base_colors.h b/gtk2_ardour/base_colors.h index ece842a457..c272dbea78 100644 --- a/gtk2_ardour/base_colors.h +++ b/gtk2_ardour/base_colors.h @@ -61,14 +61,14 @@ 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(MeterColor0, "meterColor0", 0x008800FF) +CANVAS_BASE_COLOR(MeterColor1, "meterColor1", 0x00AA00FF) +CANVAS_BASE_COLOR(MeterColor2, "meterColor2", 0x00FF00FF) +CANVAS_BASE_COLOR(MeterColor3, "meterColor3", 0x00FF00FF) +CANVAS_BASE_COLOR(MeterColor4, "meterColor4", 0xFFF000ff) +CANVAS_BASE_COLOR(MeterColor5, "meterColor5", 0xFFF000ff) +CANVAS_BASE_COLOR(MeterColor6, "meterColor6", 0xFF8800ff) +CANVAS_BASE_COLOR(MeterColor7, "meterColor7", 0xFF8800ff) CANVAS_BASE_COLOR(MeterColor8, "meterColor8", 0xFF0000ff) CANVAS_BASE_COLOR(MeterColor9, "meterColor9", 0xFF0000ff) diff --git a/gtk2_ardour/ui_config.cc b/gtk2_ardour/ui_config.cc index d6fba7e2eb..76b8844896 100644 --- a/gtk2_ardour/ui_config.cc +++ b/gtk2_ardour/ui_config.cc @@ -464,8 +464,6 @@ UIConfiguration::load_color_aliases (XMLNode const & node) } } - -#if 0 void UIConfiguration::load_relative_colors (XMLNode const & node) { |