fix HSlider Option

[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 b1ffbd7d4b3c009d30565e7af6897ce74db157d8..c6e42c0a4bd280a1da4a7ad14349363f6669fe8e 100644 (file)
--- a/gtk2_ardour/audio_region_view.cc
+++ b/gtk2_ardour/audio_region_view.cc
@@ -21,7 +21,6 @@
 #include <algorithm>
 
 #include <boost/scoped_array.hpp>
-#include <boost/scoped_ptr.hpp>
 
 #include <gtkmm.h>
 
@@ -522,14 +521,12 @@ AudioRegionView::reset_fade_shapes ()
 void
 AudioRegionView::reset_fade_in_shape ()
 {
-       reset_fade_in_shape_width ((framecnt_t) audio_region()->fade_in()->back()->when);
+       reset_fade_in_shape_width (audio_region(), (framecnt_t) audio_region()->fade_in()->back()->when);
 }
 
 void
-AudioRegionView::reset_fade_in_shape_width (framecnt_t width)
+AudioRegionView::reset_fade_in_shape_width (boost::shared_ptr<AudioRegion> ar, framecnt_t width)
 {
-       redraw_start_xfade ();
-
        if (fade_in_handle == 0) {
                return;
        }
@@ -554,6 +551,7 @@ AudioRegionView::reset_fade_in_shape_width (framecnt_t width)
        fade_in_handle->property_x2() = handle_center + handle_size;
 
        if (pwidth < 5) {
+               hide_start_xfade();
                fade_in_shape->hide();
                return;
        }
@@ -598,23 +596,24 @@ AudioRegionView::reset_fade_in_shape_width (framecnt_t width)
        fade_in_shape->property_points() = *points;
        delete points;
 
+       redraw_start_xfade_to ( ar, width);
+
        /* ensure trim handle stays on top */
        if (frame_handle_start) {
                frame_handle_start->raise_to_top();
        }
+
 }
 
 void
 AudioRegionView::reset_fade_out_shape ()
 {
-       reset_fade_out_shape_width ((framecnt_t) audio_region()->fade_out()->back()->when);
+       reset_fade_out_shape_width (audio_region(), (framecnt_t) audio_region()->fade_out()->back()->when);
 }
 
 void
-AudioRegionView::reset_fade_out_shape_width (framecnt_t width)
+AudioRegionView::reset_fade_out_shape_width (boost::shared_ptr<AudioRegion> ar, framecnt_t width)
 {
-       redraw_end_xfade ();
-
        if (fade_out_handle == 0) {
                return;
        }
@@ -643,6 +642,7 @@ AudioRegionView::reset_fade_out_shape_width (framecnt_t width)
        /* don't show shape if its too small */
 
        if (pwidth < 5) {
+               hide_end_xfade();
                fade_out_shape->hide();
                return;
        }
@@ -687,10 +687,13 @@ AudioRegionView::reset_fade_out_shape_width (framecnt_t width)
        fade_out_shape->property_points() = *points;
        delete points;
 
+       redraw_end_xfade_to (ar, width);
+
        /* ensure trim handle stays on top */
        if (frame_handle_end) {
                frame_handle_end->raise_to_top();
        }
+
 }
 
 framepos_t
@@ -1267,7 +1270,6 @@ AudioRegionView::show_region_editor ()
        }
 
        editor->present ();
-       editor->set_position (Gtk::WIN_POS_MOUSE);
        editor->show_all();
 }
 
@@ -1411,7 +1413,7 @@ AudioRegionView::redraw_start_xfade_to (boost::shared_ptr<AudioRegion> ar, frame
        if (!start_xfade_out) {
                start_xfade_out = new ArdourCanvas::Line (*group);
                start_xfade_out->property_width_pixels() = 1;
-               uint32_t col = UINT_RGBA_CHANGE_A (ARDOUR_UI::config()->canvasvar_GainLine.get(), 255);
+               uint32_t col = UINT_RGBA_CHANGE_A (ARDOUR_UI::config()->canvasvar_GainLine.get(), 128);
                start_xfade_out->property_fill_color_rgba() = col;
        }
 
@@ -1519,7 +1521,7 @@ AudioRegionView::redraw_end_xfade_to (boost::shared_ptr<AudioRegion> ar, framecn
        if (!end_xfade_out) {
                end_xfade_out = new ArdourCanvas::Line (*group);
                end_xfade_out->property_width_pixels() = 1;
-               uint32_t col UINT_RGBA_CHANGE_A (ARDOUR_UI::config()->canvasvar_GainLine.get(), 255);
+               uint32_t col UINT_RGBA_CHANGE_A (ARDOUR_UI::config()->canvasvar_GainLine.get(), 128);
                end_xfade_out->property_fill_color_rgba() = col;
        }
 
@@ -1534,7 +1536,7 @@ AudioRegionView::redraw_end_xfade_to (boost::shared_ptr<AudioRegion> ar, framecn
        }
 
        Points* points = get_canvas_points ("xfade edit redraw", npoints);
-       boost::scoped_ptr<float> vec (new float[npoints]);
+       boost::scoped_array<float> vec (new float[npoints]);
 
        ar->fade_out()->curve().get_vector (0, ar->fade_out()->back()->when, vec.get(), npoints);