streamline logic for setting waveform colors

diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc
index 162ddaaf5483615ce08cf57ffa5ed0e92975fbc7..c24facb8e49b3823baafa940326f0bfda0a4ade4 100644 (file)
--- a/gtk2_ardour/audio_region_view.cc
+++ b/gtk2_ardour/audio_region_view.cc
@@ -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

diff --git a/gtk2_ardour/audio_region_view.h b/gtk2_ardour/audio_region_view.h
index 550632dc6770a37244611306c76e42825b4e8dca..a80dc5a7b60116c93ea8e9392e0b4843617935df 100644 (file)
--- 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 ();