smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-08 15:54:57 +01:00
Code Issues Projects Releases Wiki Activity

correctly (?) indicate muted status of audio regions

Browse source
This commit is contained in:
Paul Davis 2014-01-26 16:03:04 -05:00
parent bb05ae05a8
commit 2c79f74e49
1 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
gtk2_ardour/audio_region_view.cc
View file

@ -63,7 +63,7 @@
#include "i18n.h" #include "i18n.h"
#define MUTED_ALPHA 10 #define MUTED_ALPHA 48
using namespace std; using namespace std;
using namespace ARDOUR; using namespace ARDOUR;
@ -1404,24 +1404,28 @@ AudioRegionView::set_one_waveform_color (ArdourCanvas::WaveView* wave)
if (_selected) { if (_selected) {
if (_region->muted()) { if (_region->muted()) {
outline = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->get_canvasvar_SelectedWaveForm(), MUTED_ALPHA); /* hide outline with zero alpha */
outline = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->get_canvasvar_SelectedWaveForm(), 0);
fill = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->get_canvasvar_SelectedWaveFormFill(), MUTED_ALPHA);
} else { } else {
outline = ARDOUR_UI::config()->get_canvasvar_SelectedWaveForm(); outline = ARDOUR_UI::config()->get_canvasvar_SelectedWaveForm();
}
fill = ARDOUR_UI::config()->get_canvasvar_SelectedWaveFormFill(); fill = ARDOUR_UI::config()->get_canvasvar_SelectedWaveFormFill();
}
} else { } else {
if (_recregion) { if (_recregion) {
outline = ARDOUR_UI::config()->get_canvasvar_RecWaveForm(); outline = ARDOUR_UI::config()->get_canvasvar_RecWaveForm();
fill = ARDOUR_UI::config()->get_canvasvar_RecWaveFormFill(); fill = ARDOUR_UI::config()->get_canvasvar_RecWaveFormFill();
} else { } else {
if (_region->muted()) { if (_region->muted()) {
outline = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->get_canvasvar_WaveForm(), MUTED_ALPHA); /* hide outline with zero alpha */
outline = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->get_canvasvar_WaveForm(), 0);
fill = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->get_canvasvar_WaveFormFill(), MUTED_ALPHA);
} else { } else {
outline = ARDOUR_UI::config()->get_canvasvar_WaveForm(); outline = ARDOUR_UI::config()->get_canvasvar_WaveForm();
}
fill = ARDOUR_UI::config()->get_canvasvar_WaveFormFill(); fill = ARDOUR_UI::config()->get_canvasvar_WaveFormFill();
} }
} }
}
if (ARDOUR_UI::config()->get_color_regions_using_track_color()) { if (ARDOUR_UI::config()->get_color_regions_using_track_color()) {
@ -1432,7 +1436,7 @@ AudioRegionView::set_one_waveform_color (ArdourCanvas::WaveView* wave)
double r, g, b, a; double r, g, b, a;
ArdourCanvas::color_to_rgba (fill, r, g, b, a); ArdourCanvas::color_to_rgba (fill, r, g, b, a);
fill = ArdourCanvas::rgba_to_color (r, g, b, 0.85); /* magic number, not user controllable */ fill = ArdourCanvas::rgba_to_color (r, g, b, 0.85); /* magic number, not user controllable */
outline = ARDOUR_UI::config()->get_canvasvar_WaveForm();
} }
wave->set_fill_color (fill); wave->set_fill_color (fill);