diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2006-09-28 17:23:52 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2006-09-28 17:23:52 +0000 |
| commit | 93c7aeba048f19df5abee5e4325ef8b0ef62c279 (patch) | |
| tree | 5bc2149d17fb5272c5b6284f7e902faad39a92f7 /gtk2_ardour/audio_region_view.cc | |
| parent | 3e6feb62ae37cbf98364ccb36e9be47a52ceb8bf (diff) | |
fixes for destructive track offsets of various kinds; move from jack_nframes_t -> nframes_t
git-svn-id: svn://localhost/ardour2/trunk@933 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/audio_region_view.cc')
| -rw-r--r-- | gtk2_ardour/audio_region_view.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc index 86786b801f..076473881d 100644 --- 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; |