globally change all use of "frame" to refer to audio into "sample".

[ardour.git] / libs / ardour / audioanalyser.cc

diff --git a/libs/ardour/audioanalyser.cc b/libs/ardour/audioanalyser.cc
index f90edd380a094d2840daa7af61c87f814180fcc0..e08171c4a4c4aae7540344eb30cb52eeb78902a0 100644 (file)
--- a/libs/ardour/audioanalyser.cc
+++ b/libs/ardour/audioanalyser.cc
@@ -107,8 +107,8 @@ AudioAnalyser::analyse (const string& path, Readable* src, uint32_t channel)
        int ret = -1;
        bool done = false;
        Sample* data = 0;
-       framecnt_t len = src->readable_length();
-       framepos_t pos = 0;
+       samplecnt_t len = src->readable_length();
+       samplepos_t pos = 0;
        float* bufs[1] = { 0 };
 
        data = new Sample[bufsize];
@@ -116,11 +116,11 @@ AudioAnalyser::analyse (const string& path, Readable* src, uint32_t channel)
 
        while (!done) {
 
-               framecnt_t to_read;
+               samplecnt_t to_read;
 
                /* read from source */
 
-               to_read = min ((len - pos), (framecnt_t) bufsize);
+               to_read = min ((len - pos), (samplecnt_t) bufsize);
 
                if (src->read (data, pos, to_read, channel) != to_read) {
                        goto out;