diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2013-06-20 23:11:40 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-06-20 23:11:40 -0400 |
commit | 594a8c122141094a5f03ab9d2faa9b9cc18eeae0 (patch) | |
tree | c8b5d25580c80cc52e1b1a1063183f853ef67278 | |
parent | 27c943f1ddca0890ac2e5547b249334e0266c0a5 (diff) |
set waveform color to a V-reduced version of the frame fill color.
-rw-r--r-- | gtk2_ardour/audio_region_view.cc | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc index fbe3c41264..6ee30ea912 100644 --- a/gtk2_ardour/audio_region_view.cc +++ b/gtk2_ardour/audio_region_view.cc @@ -43,6 +43,7 @@ #include "canvas/line.h" #include "canvas/text.h" #include "canvas/debug.h" +#include "canvas/utils.h" #include "streamview.h" #include "audio_region_view.h" @@ -1186,10 +1187,21 @@ AudioRegionView::create_one_wave (uint32_t which, bool /*direct*/) if (_recregion) { wave->set_outline_color (_region->muted() ? UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->get_canvasvar_RecWaveForm(), MUTED_ALPHA) : ARDOUR_UI::config()->get_canvasvar_RecWaveForm()); + + + wave->set_fill_color (ARDOUR_UI::config()->get_canvasvar_RecWaveFormFill()); } else { wave->set_outline_color (_region->muted() ? UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->get_canvasvar_WaveForm(), MUTED_ALPHA) : ARDOUR_UI::config()->get_canvasvar_WaveForm()); - wave->set_fill_color (ARDOUR_UI::config()->get_canvasvar_WaveFormFill()); + + ArdourCanvas::Color c = frame->fill_color (); + double h, s, v; + ArdourCanvas::color_to_hsv (c, h, s, v); + v *= 0.5; + c = ArdourCanvas::hsv_to_color (h, s, v, 1.0); + + //wave->set_fill_color (ARDOUR_UI::config()->get_canvasvar_WaveFormFill()); + wave->set_fill_color (c); } wave->set_clip_color (ARDOUR_UI::config()->get_canvasvar_WaveFormClip()); |