diff options
| author | Carl Hetherington <carl@carlh.net> | 2009-08-23 19:42:01 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2009-08-23 19:42:01 +0000 |
| commit | c91da28eb2552c4270e7f07026ee9609c3af717e (patch) | |
| tree | b884c0d65bae5118bfd1f8326e648721aec36ce4 /libs | |
| parent | dffd30baf9f9db9310ddf82a5a7d05f96354acd6 (diff) | |
Some improvements to performance with crossfades: don't recompute a whole track's crossfade curves
when one region is moved and the display is overlaid; use a std::map for an AudioStreamView's crossfades
list so that add_crossfade can find whether a CrossfadeView already exists without looking through
the whole list.
git-svn-id: svn://localhost/ardour2/branches/3.0@5571 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ardour/ardour/crossfade.h | 2 | ||||
| -rw-r--r-- | libs/ardour/crossfade.cc | 9 |
2 files changed, 1 insertions, 10 deletions
diff --git a/libs/ardour/ardour/crossfade.h b/libs/ardour/ardour/crossfade.h index 4afa38126c..9e1e39bb14 100644 --- a/libs/ardour/ardour/crossfade.h +++ b/libs/ardour/ardour/crossfade.h @@ -106,8 +106,6 @@ class Crossfade : public ARDOUR::AudioRegion nframes_t overlap_length() const; - void invalidate(); - sigc::signal<void,boost::shared_ptr<Region> > Invalidated; sigc::signal<void,Change> StateChanged; diff --git a/libs/ardour/crossfade.cc b/libs/ardour/crossfade.cc index 2f0d66f8fb..86d509ec66 100644 --- a/libs/ardour/crossfade.cc +++ b/libs/ardour/crossfade.cc @@ -408,7 +408,7 @@ Crossfade::refresh () int32_t new_layer_relation = (int32_t) (_in->layer() - _out->layer()); - if (new_layer_relation * layer_relation < 0) { // different sign, layers rotated + if (new_layer_relation * layer_relation < 0) { // different sign, layers rotated Invalidated (shared_from_this ()); return false; } @@ -438,7 +438,6 @@ Crossfade::refresh () send_signal = true; } else { - Invalidated (shared_from_this ()); return false; } @@ -926,9 +925,3 @@ Crossfade::set_short_xfade_length (nframes_t n) { _short_xfade_length = n; } - -void -Crossfade::invalidate () -{ - Invalidated (shared_from_this ()); /* EMIT SIGNAL */ -} |