ardour/livetrax
13
0
Fork 0
Code

Restore fade option to strip silence.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@8992 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2011-02-28 18:57:43 +00:00
parent 2d3c640fee
commit f9b1e437a5
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gtk2_ardour/strip_silence_dialog.cc
View File

@ -84,12 +84,9 @@ StripSilenceDialog::StripSilenceDialog (Session* s, list<RegionView*> const & v)
_minimum_length.set_mode (AudioClock::Frames); _minimum_length.set_mode (AudioClock::Frames);
_minimum_length.set (1000, true); _minimum_length.set (1000, true);
/* Add this back when we finally do something with it */
/*
table->attach (*Gtk::manage (new Gtk::Label (_("Fade length"), 1, 0.5)), 0, 1, n, n + 1, Gtk::FILL); table->attach (*Gtk::manage (new Gtk::Label (_("Fade length"), 1, 0.5)), 0, 1, n, n + 1, Gtk::FILL);
table->attach (_fade_length, 1, 2, n, n + 1, Gtk::FILL); table->attach (_fade_length, 1, 2, n, n + 1, Gtk::FILL);
++n; ++n;
*/
_fade_length.set_session (s); _fade_length.set_session (s);
_fade_length.set_mode (AudioClock::Frames); _fade_length.set_mode (AudioClock::Frames);
@ -282,7 +279,7 @@ StripSilenceDialog::minimum_length () const
framecnt_t framecnt_t
StripSilenceDialog::fade_length () const StripSilenceDialog::fade_length () const
{ {
return _minimum_length.current_duration (views.front().view->region()->position()); return _fade_length.current_duration (views.front().view->region()->position());
} }
void void

5
libs/ardour/strip_silence.cc
View File

@ -123,9 +123,12 @@ StripSilence::run (boost::shared_ptr<Region> r, Progress* progress)
); );
copy->set_name (RegionFactory::new_region_name (region->name ())); 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_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); results.push_back (copy);
if (progress && (n <= N)) { if (progress && (n <= N)) {