use a different approach for indicating expose rects (from robin gareus). #ifdef...

[ardour.git] / gtk2_ardour / audio_region_view.cc

diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc
index 162ddaaf5483615ce08cf57ffa5ed0e92975fbc7..9c21a9403d674e6daa52fb8335037bdc13ea9965 100644 (file)
--- a/gtk2_ardour/audio_region_view.cc
+++ b/gtk2_ardour/audio_region_view.cc
@@ -76,7 +76,7 @@ static const int32_t sync_mark_width = 9;
 static double const handle_size = 10; /* height of fade handles */
 
 AudioRegionView::AudioRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView &tv, boost::shared_ptr<AudioRegion> r, double spu,
-                                 Gdk::Color const & basic_color)
+                                 uint32_t basic_color)
        : RegionView (parent, tv, r, spu, basic_color)
        , sync_mark(0)
        , fade_in_handle(0)
@@ -90,7 +90,6 @@ AudioRegionView::AudioRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView
        , end_xfade_rect (0)
        , _end_xfade_visible (false)
        , _amplitude_above_axis(1.0)
-       , fade_color(0)
        , trim_fade_in_drag_active(false)
        , trim_fade_out_drag_active(false)
 {
@@ -98,7 +97,7 @@ AudioRegionView::AudioRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView
 }
 
 AudioRegionView::AudioRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView &tv, boost::shared_ptr<AudioRegion> r, double spu,
-                                 Gdk::Color const & basic_color, bool recording, TimeAxisViewItem::Visibility visibility)
+                                 uint32_t basic_color, bool recording, TimeAxisViewItem::Visibility visibility)
        : RegionView (parent, tv, r, spu, basic_color, recording, visibility)
        , sync_mark(0)
        , fade_in_handle(0)
@@ -112,7 +111,6 @@ AudioRegionView::AudioRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView
        , end_xfade_rect (0)
        , _end_xfade_visible (false)
        , _amplitude_above_axis(1.0)
-       , fade_color(0)
        , trim_fade_in_drag_active(false)
        , trim_fade_out_drag_active(false)
 {
@@ -132,60 +130,51 @@ AudioRegionView::AudioRegionView (const AudioRegionView& other, boost::shared_pt
        , end_xfade_rect (0)
        , _end_xfade_visible (false)
        , _amplitude_above_axis (other._amplitude_above_axis)
-       , fade_color(0)
        , trim_fade_in_drag_active(false)
        , trim_fade_out_drag_active(false)
 {
-       Gdk::Color c;
-       int r,g,b,a;
-
-       UINT_TO_RGBA (other.fill_color, &r, &g, &b, &a);
-       c.set_rgb_p (r/255.0, g/255.0, b/255.0);
-
-       init (c, true);
+       init (true);
 
        Config->ParameterChanged.connect (*this, invalidator (*this), boost::bind (&AudioRegionView::parameter_changed, this, _1), gui_context());
 }
 
 void
-AudioRegionView::init (Gdk::Color const & basic_color, bool wfd)
+AudioRegionView::init (bool wfd)
 {
        // FIXME: Some redundancy here with RegionView::init.  Need to figure out
        // where order is important and where it isn't...
 
-       RegionView::init (basic_color, wfd);
+       RegionView::init (wfd);
 
        _amplitude_above_axis = 1.0;
 
-       compute_colors (basic_color);
-
        create_waves ();
 
        if (!_recregion) {
                fade_in_handle = new ArdourCanvas::Rectangle (group);
                CANVAS_DEBUG_NAME (fade_in_handle, string_compose ("fade in handle for %1", region()->name()));
-               fade_in_handle->set_outline_color (RGBA_TO_UINT (0, 0, 0, 255));
+               fade_in_handle->set_outline_color (ArdourCanvas::rgba_to_color (0, 0, 0, 1.0));
                fade_in_handle->set_fill_color (ARDOUR_UI::config()->get_canvasvar_InactiveFadeHandle());
                fade_in_handle->set_data ("regionview", this);
                fade_in_handle->hide ();
 
                fade_out_handle = new ArdourCanvas::Rectangle (group);
                CANVAS_DEBUG_NAME (fade_out_handle, string_compose ("fade out handle for %1", region()->name()));
-               fade_out_handle->set_outline_color (RGBA_TO_UINT (0, 0, 0, 255));
+               fade_out_handle->set_outline_color (ArdourCanvas::rgba_to_color (0, 0, 0, 1.0));
                fade_out_handle->set_fill_color (ARDOUR_UI::config()->get_canvasvar_InactiveFadeHandle());
                fade_out_handle->set_data ("regionview", this);
                fade_out_handle->hide ();
 
                fade_in_trim_handle = new ArdourCanvas::Rectangle (group);
                CANVAS_DEBUG_NAME (fade_in_handle, string_compose ("fade in trim handle for %1", region()->name()));
-               fade_in_trim_handle->set_outline_color (RGBA_TO_UINT (0, 0, 0, 255));
+               fade_in_trim_handle->set_outline_color (ArdourCanvas::rgba_to_color (0, 0, 0, 1.0));
                fade_in_trim_handle->set_fill_color (ARDOUR_UI::config()->get_canvasvar_InactiveFadeHandle());
                fade_in_trim_handle->set_data ("regionview", this);
                fade_in_trim_handle->hide ();
 
                fade_out_trim_handle = new ArdourCanvas::Rectangle (group);
                CANVAS_DEBUG_NAME (fade_out_handle, string_compose ("fade out trim handle for %1", region()->name()));
-               fade_out_trim_handle->set_outline_color (RGBA_TO_UINT (0, 0, 0, 255));
+               fade_out_trim_handle->set_outline_color (ArdourCanvas::rgba_to_color (0, 0, 0, 1.0));
                fade_out_trim_handle->set_fill_color (ARDOUR_UI::config()->get_canvasvar_InactiveFadeHandle());
                fade_out_trim_handle->set_data ("regionview", this);
                fade_out_trim_handle->hide ();
@@ -995,16 +984,6 @@ AudioRegionView::set_amplitude_above_axis (gdouble a)
        }
 }
 
-void
-AudioRegionView::compute_colors (Gdk::Color const & basic_color)
-{
-       RegionView::compute_colors (basic_color);
-
-       /* gain color computed in envelope_active_changed() */
-
-       fade_color = UINT_RGBA_CHANGE_A (fill_color, 120);
-}
-
 void
 AudioRegionView::set_colors ()
 {
@@ -1164,6 +1143,7 @@ AudioRegionView::create_one_wave (uint32_t which, bool /*direct*/)
        wave->set_height (ht);
        wave->set_samples_per_pixel (samples_per_pixel);
        wave->set_show_zero_line (true);
+       wave->set_clip_level (Config->get_waveform_clip_level ());
        
        switch (Config->get_waveform_shape()) {
        case Rectified:
@@ -1408,17 +1388,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 +1433,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