diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2014-06-05 14:12:40 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-06-05 14:12:58 -0400 |
commit | ac33bb425641bd4377f68f8a6a3eabc6c58286a9 (patch) | |
tree | 597e053e3a34726cd581a5afd48a4972170c1f66 | |
parent | 05f476875ba5ad01e34b297837d9e3dfb246349c (diff) |
streamline logic for setting waveform colors
-rw-r--r-- | gtk2_ardour/audio_region_view.cc | 20 | ||||
-rw-r--r-- | gtk2_ardour/audio_region_view.h | 1 |
2 files changed, 8 insertions, 13 deletions
diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc index 162ddaaf54..c24facb8e4 100644 --- a/gtk2_ardour/audio_region_view.cc +++ b/gtk2_ardour/audio_region_view.cc @@ -1409,16 +1409,10 @@ 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 diff --git a/gtk2_ardour/audio_region_view.h b/gtk2_ardour/audio_region_view.h index 550632dc67..a80dc5a7b6 100644 --- a/gtk2_ardour/audio_region_view.h +++ b/gtk2_ardour/audio_region_view.h @@ -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 (); |