diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2014-12-07 16:10:39 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-12-07 16:11:24 -0500 |
| commit | acd54f1c58a951dd99c080954d3714e486997ad7 (patch) | |
| tree | 617631e7546340f36097f88ff351731953e4d619 | |
| parent | a5e5c14c772b8ca515b7ed75b580aa1dfd1442dc (diff) | |
Revert "new code-level defaults for audio peak meter colors"
This reverts commit 564d2860f85340ea091cfa4d92cb5f84d2a40fb1.
| -rw-r--r-- | gtk2_ardour/base_colors.h | 16 | ||||
| -rw-r--r-- | gtk2_ardour/ui_config.cc | 2 |
2 files changed, 10 insertions, 8 deletions
diff --git a/gtk2_ardour/base_colors.h b/gtk2_ardour/base_colors.h index c272dbea78..ece842a457 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", 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(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/ui_config.cc b/gtk2_ardour/ui_config.cc index 76b8844896..d6fba7e2eb 100644 --- a/gtk2_ardour/ui_config.cc +++ b/gtk2_ardour/ui_config.cc @@ -464,6 +464,8 @@ UIConfiguration::load_color_aliases (XMLNode const & node) } } + +#if 0 void UIConfiguration::load_relative_colors (XMLNode const & node) { |