From 9dae320b12ddbfcf9aefb24e4c5f8e2a7c98d10b Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 24 May 2012 22:03:19 +0000 Subject: always create short xfades when adding a region based on capture git-svn-id: svn://localhost/ardour2/branches/3.0@12443 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/audio_playlist.cc | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) (limited to 'libs/ardour/audio_playlist.cc') diff --git a/libs/ardour/audio_playlist.cc b/libs/ardour/audio_playlist.cc index 25fad6122f..76cab14699 100644 --- a/libs/ardour/audio_playlist.cc +++ b/libs/ardour/audio_playlist.cc @@ -314,13 +314,18 @@ AudioPlaylist::check_crossfades (Evoral::Range range) /* Top's fade-in will cause an implicit fade-out of bottom */ framecnt_t len = 0; - switch (_session.config.get_xfade_model()) { - case FullCrossfade: - len = bottom->last_frame () - top->first_frame (); - break; - case ShortCrossfade: + + if (_capture_insertion_underway) { len = _session.config.get_short_xfade_seconds() * _session.frame_rate(); - break; + } else { + switch (_session.config.get_xfade_model()) { + case FullCrossfade: + len = bottom->last_frame () - top->first_frame (); + break; + case ShortCrossfade: + len = _session.config.get_short_xfade_seconds() * _session.frame_rate(); + break; + } } top->set_fade_in_active (true); @@ -357,13 +362,18 @@ AudioPlaylist::check_crossfades (Evoral::Range range) /* Top's fade-out will cause an implicit fade-in of bottom */ framecnt_t len = 0; - switch (_session.config.get_xfade_model()) { - case FullCrossfade: - len = top->last_frame () - bottom->first_frame (); - break; - case ShortCrossfade: + + if (_capture_insertion_underway) { len = _session.config.get_short_xfade_seconds() * _session.frame_rate(); - break; + } else { + switch (_session.config.get_xfade_model()) { + case FullCrossfade: + len = top->last_frame () - bottom->first_frame (); + break; + case ShortCrossfade: + len = _session.config.get_short_xfade_seconds() * _session.frame_rate(); + break; + } } top->set_fade_out_active (true); -- cgit v1.2.3