diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2012-05-11 21:30:36 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-05-11 21:30:36 +0000 |
| commit | a98fa4bc61e26cd94aeb6720325633c4e6618155 (patch) | |
| tree | 21e55518ce42e5ffe3e974b32e10192525627b82 /libs/ardour/audio_playlist.cc | |
| parent | 4d780bdcd0009943ec292dfd2177e60804d91245 (diff) | |
switch to 5 new fade curves, taken from mixbus2 branch. make xfade context menus functional even though the images are not accurate
git-svn-id: svn://localhost/ardour2/branches/3.0@12253 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, 8 insertions, 4 deletions
diff --git a/libs/ardour/audio_playlist.cc b/libs/ardour/audio_playlist.cc index 867f6f0ce4..9b433d160b 100644 --- a/libs/ardour/audio_playlist.cc +++ b/libs/ardour/audio_playlist.cc @@ -328,12 +328,16 @@ AudioPlaylist::check_crossfades (Evoral::Range<framepos_t> range) top->set_fade_in_active (true); top->set_fade_in_is_xfade (true); + /* XXX may 2012: -3dB and -6dB curves + * are the same right now + */ + switch (_session.config.get_xfade_choice ()) { case ConstantPowerMinus3dB: - top->set_fade_in (FadeConstantPowerMinus3dB, len); + top->set_fade_in (FadeConstantPower, len); break; case ConstantPowerMinus6dB: - top->set_fade_in (FadeConstantPowerMinus6dB, len); + top->set_fade_in (FadeConstantPower, len); break; case RegionFades: top->set_fade_in_length (len); @@ -369,10 +373,10 @@ AudioPlaylist::check_crossfades (Evoral::Range<framepos_t> range) switch (_session.config.get_xfade_choice ()) { case ConstantPowerMinus3dB: - top->set_fade_out (FadeConstantPowerMinus3dB, len); + top->set_fade_out (FadeConstantPower, len); break; case ConstantPowerMinus6dB: - top->set_fade_out (FadeConstantPowerMinus6dB, len); + top->set_fade_out (FadeConstantPower, len); break; case RegionFades: top->set_fade_out_length (len); |