diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2010-02-18 13:59:49 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-02-18 13:59:49 +0000 |
| commit | ce7a5e1c9fa3edf2d9cc66875505e402a0aaa6f6 (patch) | |
| tree | 8a798270cd892823c7eeef99c2f3cdd4bf657bb3 /libs/ardour/audio_playlist.cc | |
| parent | cdcc4d3720d8168a158f6a5a5f23e9ce981bc68c (diff) | |
the Properties & 64bit region commit
git-svn-id: svn://localhost/ardour2/branches/3.0@6695 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/audio_playlist.cc')
| -rw-r--r-- | libs/ardour/audio_playlist.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libs/ardour/audio_playlist.cc b/libs/ardour/audio_playlist.cc index 7f75d44852..60c7d4bdc3 100644 --- a/libs/ardour/audio_playlist.cc +++ b/libs/ardour/audio_playlist.cc @@ -420,7 +420,7 @@ AudioPlaylist::check_dependents (boost::shared_ptr<Region> r, bool norefresh) audio engineering. */ - xfade_length = min ((nframes_t) 720, top->length()); + xfade_length = min ((framecnt_t) 720, top->length()); if (top_region_at (top->first_frame()) == top) { @@ -454,7 +454,7 @@ AudioPlaylist::check_dependents (boost::shared_ptr<Region> r, bool norefresh) } else { touched_regions = regions_touched (top->first_frame(), - top->first_frame() + min ((nframes_t)_session.config.get_short_xfade_seconds() * _session.frame_rate(), + top->first_frame() + min ((framecnt_t) _session.config.get_short_xfade_seconds() * _session.frame_rate(), top->length())); if (touched_regions->size() <= 2) { xfade = boost::shared_ptr<Crossfade> (new Crossfade (region, other, _session.config.get_xfade_model(), _session.config.get_xfades_active())); @@ -480,7 +480,7 @@ AudioPlaylist::check_dependents (boost::shared_ptr<Region> r, bool norefresh) } else { touched_regions = regions_touched (bottom->first_frame(), - bottom->first_frame() + min ((nframes_t)_session.config.get_short_xfade_seconds() * _session.frame_rate(), + bottom->first_frame() + min ((framecnt_t)_session.config.get_short_xfade_seconds() * _session.frame_rate(), bottom->length())); if (touched_regions->size() <= 2) { xfade = boost::shared_ptr<Crossfade> (new Crossfade (region, other, _session.config.get_xfade_model(), _session.config.get_xfades_active())); @@ -726,7 +726,7 @@ AudioPlaylist::destroy_region (boost::shared_ptr<Region> region) } void -AudioPlaylist::crossfade_changed (Change) +AudioPlaylist::crossfade_changed (PropertyChange) { if (in_flush || in_set_state) { return; @@ -742,13 +742,13 @@ AudioPlaylist::crossfade_changed (Change) } bool -AudioPlaylist::region_changed (Change what_changed, boost::shared_ptr<Region> region) +AudioPlaylist::region_changed (PropertyChange what_changed, boost::shared_ptr<Region> region) { if (in_flush || in_set_state) { return false; } - Change our_interests = Change (AudioRegion::FadeInChanged| + PropertyChange our_interests = PropertyChange (AudioRegion::FadeInChanged| AudioRegion::FadeOutChanged| AudioRegion::FadeInActiveChanged| AudioRegion::FadeOutActiveChanged| |