ardour/livetrax
13
0
Fork 0
Code

streamline logic for setting waveform colors

Browse Source
This commit is contained in:
Paul Davis 2014-06-05 14:12:40 -04:00
parent 05f476875b
commit ac33bb4256
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gtk2_ardour/audio_region_view.cc
View File

@ -1408,17 +1408,11 @@ AudioRegionView::color_handler ()
void
AudioRegionView::set_waveform_colors ()
{
for (vector<ArdourCanvas::WaveView*>::iterator w = waves.begin(); w != waves.end(); ++w) {
set_one_waveform_color (*w);
}
}
void
AudioRegionView::set_one_waveform_color (ArdourCanvas::WaveView* wave)
{
ArdourCanvas::Color fill;
ArdourCanvas::Color outline;
ArdourCanvas::Color clip = ARDOUR_UI::config()->get_canvasvar_WaveFormClip();
ArdourCanvas::Color zero = ARDOUR_UI::config()->get_canvasvar_ZeroLine();
if (_selected) {
if (_region->muted()) {
@ -1459,10 +1453,12 @@ AudioRegionView::set_one_waveform_color (ArdourCanvas::WaveView* wave)
}
}
wave->set_fill_color (fill);
wave->set_outline_color (outline);
wave->set_clip_color (ARDOUR_UI::config()->get_canvasvar_WaveFormClip());
wave->set_zero_color (ARDOUR_UI::config()->get_canvasvar_ZeroLine());
for (vector<ArdourCanvas::WaveView*>::iterator w = waves.begin(); w != waves.end(); ++w) {
(*w)->set_fill_color (fill);
(*w)->set_outline_color (outline);
(*w)->set_clip_color (clip);
(*w)->set_zero_color (zero);
}
}
void

1
gtk2_ardour/audio_region_view.h
View File

@ -193,7 +193,6 @@ class AudioRegionView : public RegionView
void set_colors ();
void set_waveform_colors ();
void set_one_waveform_color (ArdourCanvas::WaveView*);
void compute_colors (Gdk::Color const &);
void reset_width_dependent_items (double pixel_width);
void set_frame_color ();