summaryrefslogtreecommitdiff
path: root/libs/ardour/audioregion.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2012-05-01 03:22:04 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2012-05-01 03:22:04 +0000
commita47ec8ba590d1fe663a64a50b02b1f6b61fd5743 (patch)
tree50889cd8a5b0c6c9e09ddea7b932cf6d761a9b09 /libs/ardour/audioregion.cc
parent01659c1d73ea30de8d0eb455b0182122798b578b (diff)
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
Diffstat (limited to 'libs/ardour/audioregion.cc')
-rw-r--r--libs/ardour/audioregion.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/libs/ardour/audioregion.cc b/libs/ardour/audioregion.cc
index 3f685075d1..a4d290ae6d 100644
--- a/libs/ardour/audioregion.cc
+++ b/libs/ardour/audioregion.cc
@@ -1042,16 +1042,16 @@ AudioRegion::set_fade_out (FadeShape shape, framecnt_t len)
/* setup complementary fade in for lower layers */
if (!_inverse_fade_out) {
- _inverse_fade_out.reset (new AutomationList (Evoral::Parameter (FadeInAutomation)));
+ _inverse_fade_out.reset (new AutomationList (Evoral::Parameter (FadeOutAutomation)));
}
_inverse_fade_out->clear ();
_inverse_fade_out->fast_simple_add (0.0, 0.0);
- _inverse_fade_out->fast_simple_add ((len * 0.166667), 0.166366);
- _inverse_fade_out->fast_simple_add ((len * 0.333333), 0.332853);
- _inverse_fade_out->fast_simple_add ((len * 0.500000), 0.499459);
- _inverse_fade_out->fast_simple_add ((len * 0.666667), 0.666186);
- _inverse_fade_out->fast_simple_add ((len * 0.833333), 0.833033);
+ _inverse_fade_out->fast_simple_add ((len * 0.166667), 0.282192);
+ _inverse_fade_out->fast_simple_add ((len * 0.333333), 0.518174);
+ _inverse_fade_out->fast_simple_add ((len * 0.500000), 0.707946);
+ _inverse_fade_out->fast_simple_add ((len * 0.666667), 0.851507);
+ _inverse_fade_out->fast_simple_add ((len * 0.833333), 0.948859);
_inverse_fade_out->fast_simple_add (len, 1.0);
break;
@@ -1068,7 +1068,7 @@ AudioRegion::set_fade_out (FadeShape shape, framecnt_t len)
/* setup complementary fade in for lower layers */
if (!_inverse_fade_out) {
- _inverse_fade_out.reset (new AutomationList (Evoral::Parameter (FadeInAutomation)));
+ _inverse_fade_out.reset (new AutomationList (Evoral::Parameter (FadeOutAutomation)));
}
_inverse_fade_out->clear ();