diff options
author | David Robillard <d@drobilla.net> | 2008-02-19 22:10:27 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2008-02-19 22:10:27 +0000 |
commit | a2a6cc0404757f445bd753d69f34d8bc2c0e87a9 (patch) | |
tree | 5d42f3dc23fa38679de1946d76ff0aa98845bc39 /libs/ardour/audioanalyser.cc | |
parent | 4cbd7f0eabfb9221444776bc6ea2dfe3a53cf873 (diff) |
Merge with 2.0-ongoing R3082.
Superficial generification of export stuff.
git-svn-id: svn://localhost/ardour2/branches/3.0@3088 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/audioanalyser.cc')
-rw-r--r-- | libs/ardour/audioanalyser.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/ardour/audioanalyser.cc b/libs/ardour/audioanalyser.cc index 9da404e5bf..eccc38434d 100644 --- a/libs/ardour/audioanalyser.cc +++ b/libs/ardour/audioanalyser.cc @@ -119,7 +119,7 @@ AudioAnalyser::analyse (const string& path, Readable* src, uint32_t channel) /* zero fill buffer if necessary */ if (to_read != bufsize) { - memset (data + to_read, 0, (bufsize - to_read)); + memset (data + to_read, 0, (bufsize - to_read) * sizeof (Sample)); } features = plugin->process (bufs, RealTime::fromSeconds ((double) pos / sample_rate)); @@ -128,7 +128,7 @@ AudioAnalyser::analyse (const string& path, Readable* src, uint32_t channel) goto out; } - pos += stepsize; + pos += min (stepsize, to_read); if (pos >= len) { done = true; |