diff options
| author | David Robillard <d@drobilla.net> | 2008-01-10 22:22:29 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2008-01-10 22:22:29 +0000 |
| commit | 8a2e30816ee392b871c5918f769f68cc0196a893 (patch) | |
| tree | eb85739049c0adc6186eea635aaaf65ef03f038f /gtk2_ardour/audio_region_view.cc | |
| parent | bb457bb960c5bd7ed538f9d31477293415739f68 (diff) | |
Merge with 2.0-ongoing R2883.
git-svn-id: svn://localhost/ardour2/trunk@2885 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/audio_region_view.cc')
| -rw-r--r-- | gtk2_ardour/audio_region_view.cc | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc index 96b8a57261..333d7ea87a 100644 --- a/gtk2_ardour/audio_region_view.cc +++ b/gtk2_ardour/audio_region_view.cc @@ -52,7 +52,7 @@ #include "i18n.h" -#define MUTED_ALPHA 0x50 +#define MUTED_ALPHA 10 using namespace sigc; using namespace ARDOUR; @@ -1226,14 +1226,22 @@ AudioRegionView::set_frame_color () UINT_TO_RGBA(ARDOUR_UI::config()->canvasvar_FrameBase.get(), &r, &g, &b, &a); for (vector<ArdourCanvas::WaveView*>::iterator w = waves.begin(); w != waves.end(); ++w) { - (*w)->property_wave_color() = RGBA_TO_UINT(r, g, b, fill_opacity ? fill_opacity : a);// Lets still use the theme's opacity value if Opaque is not set + if (_region->muted()) { + (*w)->property_wave_color() = RGBA_TO_UINT(r, g, b, MUTED_ALPHA); + } else { + (*w)->property_wave_color() = RGBA_TO_UINT(r, g, b, fill_opacity ? fill_opacity : a);// Lets still use the theme's opacity value if Opaque is not set + } } } else { UINT_TO_RGBA(ARDOUR_UI::config()->canvasvar_FrameBase.get(), &r, &g, &b, &a); frame->property_fill_color_rgba() = RGBA_TO_UINT(r, g, b, fill_opacity ? fill_opacity : a); for (vector<ArdourCanvas::WaveView*>::iterator w = waves.begin(); w != waves.end(); ++w) { - (*w)->property_wave_color() = ARDOUR_UI::config()->canvasvar_WaveForm.get(); + if (_region->muted()) { + (*w)->property_wave_color() = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->canvasvar_WaveForm.get(), MUTED_ALPHA); + } else { + (*w)->property_wave_color() = ARDOUR_UI::config()->canvasvar_WaveForm.get(); + } } } } |