diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2008-02-12 18:12:11 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-02-12 18:12:11 +0000 |
| commit | 72da1b892d58edbaff64a3aff5e288c1a96489ee (patch) | |
| tree | 87aa76d016ee48b771494aef701865f96890a953 /libs | |
| parent | 91c9fc2533ba0c3708d545c120ad5353be995aff (diff) | |
fix problems with files being needlessly re-analysed at startup
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3042 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ardour/analyser.cc | 4 | ||||
| -rw-r--r-- | libs/ardour/transient_detector.cc | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/libs/ardour/analyser.cc b/libs/ardour/analyser.cc index 5768ce0005..2e14c74b86 100644 --- a/libs/ardour/analyser.cc +++ b/libs/ardour/analyser.cc @@ -95,7 +95,7 @@ Analyser::work () boost::shared_ptr<AudioFileSource> afs = boost::dynamic_pointer_cast<AudioFileSource> (src); - if (afs) { + if (afs && afs->length()) { analyse_audio_file_source (afs); } } @@ -108,8 +108,6 @@ Analyser::analyse_audio_file_source (boost::shared_ptr<AudioFileSource> src) TransientDetector td (src->sample_rate()); - cerr << "analyzing " << src->name () << endl; - if (td.run (src->get_transients_path(), src.get(), 0, results) == 0) { src->set_been_analysed (true); } else { diff --git a/libs/ardour/transient_detector.cc b/libs/ardour/transient_detector.cc index b92bf5fb2d..d24c4c9442 100644 --- a/libs/ardour/transient_detector.cc +++ b/libs/ardour/transient_detector.cc @@ -6,18 +6,20 @@ using namespace Vamp; using namespace ARDOUR; using namespace std; -string TransientDetector::_op_id; +/* need a static initializer function for this */ + +string TransientDetector::_op_id = X_("libardourvampplugins:percussiononsets:2"); TransientDetector::TransientDetector (float sr) : AudioAnalyser (sr, X_("libardourvampplugins:percussiononsets")) { - if (_op_id.empty()) { - _op_id = X_("libardourvampplugins:percussiononsets"); - - // XXX this should load the above-named plugin and get the current version + /* update the op_id */ - _op_id += ":2"; - } + _op_id = X_("libardourvampplugins:percussiononsets"); + + // XXX this should load the above-named plugin and get the current version + + _op_id += ":2"; } TransientDetector::~TransientDetector() |