summaryrefslogtreecommitdiff
path: root/libs/ardour/strip_silence.cc
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2011-02-28 18:57:43 +0000
committerCarl Hetherington <carl@carlh.net>2011-02-28 18:57:43 +0000
commitf9b1e437a5ef408fe6ab279625bf9cc081bd897a (patch)
tree3f06c027e8456688d1c3dc1fba1b49f091859be9 /libs/ardour/strip_silence.cc
parent2d3c640fee5530fdf68c631feccbc22828583e98 (diff)
Restore fade option to strip silence.
git-svn-id: svn://localhost/ardour2/branches/3.0@8992 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/strip_silence.cc')
-rw-r--r--libs/ardour/strip_silence.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/libs/ardour/strip_silence.cc b/libs/ardour/strip_silence.cc
index d04612f604..ee6bfb7a5e 100644
--- a/libs/ardour/strip_silence.cc
+++ b/libs/ardour/strip_silence.cc
@@ -123,9 +123,12 @@ StripSilence::run (boost::shared_ptr<Region> r, Progress* progress)
);
copy->set_name (RegionFactory::new_region_name (region->name ()));
+
+ framecnt_t const f = std::min (_fade_length, (i->second - i->first));
copy->set_fade_in_active (true);
- copy->set_fade_in (FadeLinear, _fade_length);
+ copy->set_fade_in (FadeLinear, f);
+ copy->set_fade_out (FadeLinear, f);
results.push_back (copy);
if (progress && (n <= N)) {