fix infinite loop in quantize setup

[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 53e70fbd79b1566535cb55e79416f4ef3ea01e1e..3b98e55151b7d6aa408827a351bdf698853ba5a4 100644 (file)
--- a/gtk2_ardour/audio_region_view.cc
+++ b/gtk2_ardour/audio_region_view.cc
@@ -289,7 +289,7 @@ void
 AudioRegionView::region_changed (const PropertyChange& what_changed)
 {
        ENSURE_GUI_THREAD (*this, &AudioRegionView::region_changed, what_changed);
-        // cerr << "AudioRegionView::region_changed() called" << endl;
+       // cerr << "AudioRegionView::region_changed() called" << endl;
 
        RegionView::region_changed (what_changed);
 
@@ -297,7 +297,7 @@ AudioRegionView::region_changed (const PropertyChange& what_changed)
                region_scale_amplitude_changed ();
        }
        if (what_changed.contains (ARDOUR::Properties::fade_in)) {
-                fade_in_changed ();
+               fade_in_changed ();
        }
        if (what_changed.contains (ARDOUR::Properties::fade_out)) {
                fade_out_changed ();
@@ -573,11 +573,11 @@ AudioRegionView::reset_fade_shapes ()
 void
 AudioRegionView::reset_fade_in_shape ()
 {
-       reset_fade_in_shape_width ((nframes_t) audio_region()->fade_in()->back()->when);
+       reset_fade_in_shape_width ((framecnt_t) audio_region()->fade_in()->back()->when);
 }
 
 void
-AudioRegionView::reset_fade_in_shape_width (nframes_t width)
+AudioRegionView::reset_fade_in_shape_width (framecnt_t width)
 {
        if (fade_in_handle == 0) {
                return;
@@ -585,7 +585,7 @@ AudioRegionView::reset_fade_in_shape_width (nframes_t width)
 
        /* smallest size for a fade is 64 frames */
 
-       width = std::max ((nframes_t) 64, width);
+       width = std::max ((framecnt_t) 64, width);
 
        Points* points;
        
@@ -665,11 +665,11 @@ AudioRegionView::reset_fade_in_shape_width (nframes_t width)
 void
 AudioRegionView::reset_fade_out_shape ()
 {
-       reset_fade_out_shape_width ((nframes_t) audio_region()->fade_out()->back()->when);
+       reset_fade_out_shape_width ((framecnt_t) audio_region()->fade_out()->back()->when);
 }
 
 void
-AudioRegionView::reset_fade_out_shape_width (nframes_t width)
+AudioRegionView::reset_fade_out_shape_width (framecnt_t width)
 {
        if (fade_out_handle == 0) {
                return;
@@ -677,7 +677,7 @@ AudioRegionView::reset_fade_out_shape_width (nframes_t width)
 
        /* smallest size for a fade is 64 frames */
 
-       width = std::max ((nframes_t) 64, width);
+       width = std::max ((framecnt_t) 64, width);
 
        Points* points;
        double pwidth = width / samples_per_unit;
@@ -1043,7 +1043,7 @@ AudioRegionView::add_gain_point_event (ArdourCanvas::Item *item, GdkEvent *ev)
 
        item->w2i (x, y);
 
-       nframes_t fx = trackview.editor().pixel_to_frame (x);
+       framepos_t fx = trackview.editor().pixel_to_frame (x);
 
        if (fx > _region->length()) {
                return;
@@ -1057,9 +1057,9 @@ AudioRegionView::add_gain_point_event (ArdourCanvas::Item *item, GdkEvent *ev)
 
        gain_line->view_to_model_coord (x, y);
 
-        /* XXX STATEFUL: can't convert to stateful diff until we 
-           can represent automation data with it.
-        */
+       /* XXX STATEFUL: can't convert to stateful diff until we 
+          can represent automation data with it.
+       */
 
        trackview.session()->begin_reversible_command (_("add gain control point"));
        XMLNode &before = audio_region()->envelope()->get_state();
@@ -1236,8 +1236,8 @@ AudioRegionView::add_ghost (TimeAxisView& tv)
 void
 AudioRegionView::entered (bool internal_editing)
 {
-        trackview.editor().set_current_trimmable (_region);
-        trackview.editor().set_current_movable (_region);
+       trackview.editor().set_current_trimmable (_region);
+       trackview.editor().set_current_movable (_region);
 
        if (gain_line && _flags & EnvelopeVisible) {
                gain_line->show_all_control_points ();
@@ -1252,8 +1252,8 @@ AudioRegionView::entered (bool internal_editing)
 void
 AudioRegionView::exited ()
 {
-        trackview.editor().set_current_trimmable (boost::shared_ptr<Trimmable>());
-        trackview.editor().set_current_movable (boost::shared_ptr<Movable>());
+       trackview.editor().set_current_trimmable (boost::shared_ptr<Trimmable>());
+       trackview.editor().set_current_movable (boost::shared_ptr<Movable>());
 
        if (gain_line) {
                gain_line->hide_all_but_selected_control_points ();