smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-30 08:53:08 +01:00
Code Issues Projects Releases Wiki Activity

Improve efficiency of normalization using multiple regions in some cases.

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@7929 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2010-10-27 21:21:50 +00:00
parent 67b4433b0c
commit d75239caea
1 changed files with 20 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

50
gtk2_ardour/editor_ops.cc
View file

@ -4509,51 +4509,41 @@ Editor::normalize_region ()
set_canvas_cursor (wait_cursor);
gdk_flush ();
/* XXX: this should really count only audio regions */
/* XXX: should really only count audio regions here */
int const regions = rs.size ();
int tasks = rs.size ();
if (!dialog.normalize_individually()) {
tasks *= 2;
}
int n = 1;
double maxamp = 0;
if (!dialog.normalize_individually()) {
for (RegionSelection::iterator r = rs.begin(); r != rs.end(); ++r) {
AudioRegionView* const arv = dynamic_cast<AudioRegionView*> (*r);
if (!arv) {
continue;
}
dialog.descend (1.0 / tasks);
maxamp = max (maxamp, arv->audio_region()->maximum_amplitude (&dialog));
/* Make a list of the selected audio regions' maximum amplitudes, and also
obtain the maximum amplitude of them all.
*/
list<double> max_amps;
double max_amp = 0;
for (RegionSelection::const_iterator i = rs.begin(); i != rs.end(); ++i) {
AudioRegionView const * arv = dynamic_cast<AudioRegionView const *> (*i);
if (arv) {
dialog.descend (1.0 / regions);
double const a = arv->audio_region()->maximum_amplitude (&dialog);
max_amps.push_back (a);
max_amp = max (max_amp, a);
dialog.ascend ();
dialog.set_progress (float (n) / tasks);
++n;
}
}
list<double>::const_iterator a = max_amps.begin ();
for (RegionSelection::iterator r = rs.begin(); r != rs.end(); ++r) {
AudioRegionView* const arv = dynamic_cast<AudioRegionView*> (*r);
if (!arv) {
continue;
}
arv->region()->clear_changes ();
double amp = maxamp;
if (dialog.normalize_individually()) {
dialog.descend (1.0 / tasks);
amp = arv->audio_region()->maximum_amplitude (&dialog);
dialog.ascend ();
}
double const amp = dialog.normalize_individually() ? *a : max_amp;
arv->audio_region()->normalize (amp, dialog.target ());
_session->add_command (new StatefulDiffCommand (arv->region()));
dialog.set_progress (float (n) / tasks);
++n;
++a;
}
commit_reversible_command ();