fix audio clock field widths, change minsec display to include fractional seconds...

[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 86786b801f54311c653ab8a40d811744d7a58f5a..076473881d9a58046a9c76ed1139d0618daf7b17 100644 (file)
--- a/gtk2_ardour/audio_region_view.cc
+++ b/gtk2_ardour/audio_region_view.cc
@@ -449,11 +449,11 @@ AudioRegionView::reset_fade_shapes ()
 void
 AudioRegionView::reset_fade_in_shape ()
 {
-       reset_fade_in_shape_width ((jack_nframes_t) audio_region()->fade_in().back()->when);
+       reset_fade_in_shape_width ((nframes_t) audio_region()->fade_in().back()->when);
 }
        
 void
-AudioRegionView::reset_fade_in_shape_width (jack_nframes_t width)
+AudioRegionView::reset_fade_in_shape_width (nframes_t width)
 {
        if (fade_in_handle == 0) {
                return;
@@ -461,7 +461,7 @@ AudioRegionView::reset_fade_in_shape_width (jack_nframes_t width)
 
        /* smallest size for a fade is 64 frames */
 
-       width = std::max ((jack_nframes_t) 64, width);
+       width = std::max ((nframes_t) 64, width);
 
        Points* points;
        double pwidth = width / samples_per_unit;
@@ -533,11 +533,11 @@ AudioRegionView::reset_fade_in_shape_width (jack_nframes_t width)
 void
 AudioRegionView::reset_fade_out_shape ()
 {
-       reset_fade_out_shape_width ((jack_nframes_t) audio_region()->fade_out().back()->when);
+       reset_fade_out_shape_width ((nframes_t) audio_region()->fade_out().back()->when);
 }
 
 void
-AudioRegionView::reset_fade_out_shape_width (jack_nframes_t width)
+AudioRegionView::reset_fade_out_shape_width (nframes_t width)
 {      
        if (fade_out_handle == 0) {
                return;
@@ -545,7 +545,7 @@ AudioRegionView::reset_fade_out_shape_width (jack_nframes_t width)
 
        /* smallest size for a fade is 64 frames */
 
-       width = std::max ((jack_nframes_t) 64, width);
+       width = std::max ((nframes_t) 64, width);
 
        Points* points;
        double pwidth = width / samples_per_unit;
@@ -884,7 +884,7 @@ AudioRegionView::add_gain_point_event (ArdourCanvas::Item *item, GdkEvent *ev)
 
        item->w2i (x, y);
 
-       jack_nframes_t fx = trackview.editor.pixel_to_frame (x);
+       nframes_t fx = trackview.editor.pixel_to_frame (x);
 
        if (fx > _region->length()) {
                return;