mostly backup-oriented commit to preserve very initial pass at rendering fades-as-xfades in a more useful way. quite a bit of work to do here

git-svn-id: svn://localhost/ardour2/branches/3.0@12129 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 6 insertions, 4 deletions

diff --git a/libs/ardour/audio_playlist.cc b/libs/ardour/audio_playlist.cc
index f1c89cc565..9c304967dc 100644
--- a/libs/ardour/audio_playlist.cc
+++ b/libs/ardour/audio_playlist.cc
@@ -329,6 +329,9 @@ AudioPlaylist::check_crossfades (Evoral::Range<framepos_t> range)
 						break;
 					}
 					
+					top->set_fade_in_active (true);
+					top->set_fade_in_is_xfade (true);
+
 					switch (_session.config.get_xfade_choice ()) {
 					case ConstantPowerMinus3dB:
 						top->set_fade_in (FadeConstantPowerMinus3dB, len);
@@ -340,8 +343,6 @@ AudioPlaylist::check_crossfades (Evoral::Range<framepos_t> range)
 						top->set_fade_in_length (len);
 						break;
 					}
-					top->set_fade_in_active (true);
-					top->set_fade_in_is_xfade (true);
 					
 					done_start.insert (top);
 				}
@@ -367,6 +368,9 @@ AudioPlaylist::check_crossfades (Evoral::Range<framepos_t> range)
 						break;
 					}
 					
+					top->set_fade_out_active (true);
+					top->set_fade_out_is_xfade (true);
+
 					switch (_session.config.get_xfade_choice ()) {
 					case ConstantPowerMinus3dB:
 						top->set_fade_out (FadeConstantPowerMinus3dB, len);
@@ -378,8 +382,6 @@ AudioPlaylist::check_crossfades (Evoral::Range<framepos_t> range)
 						top->set_fade_out_length (len);
 						break;
 					}
-					top->set_fade_out_active (true);
-					top->set_fade_out_is_xfade (true);
 
 					done_end.insert (top);
 				}