Mercurial > hg > svcore
diff data/fileio/DecodingWavFileReader.h @ 1069:32ab6c48efaa
Merge from branch tonioni
author | Chris Cannam |
---|---|
date | Mon, 20 Apr 2015 09:11:34 +0100 |
parents | a1cd5abcb38b |
children | 4d9816ba0ebe |
line wrap: on
line diff
--- a/data/fileio/DecodingWavFileReader.h Mon Mar 02 17:21:34 2015 +0000 +++ b/data/fileio/DecodingWavFileReader.h Mon Apr 20 09:11:34 2015 +0100 @@ -37,7 +37,7 @@ DecodingWavFileReader(FileSource source, ResampleMode resampleMode, CacheMode cacheMode, - int targetRate = 0, + sv_samplerate_t targetRate = 0, bool normalised = false, ProgressReporter *reporter = 0); virtual ~DecodingWavFileReader(); @@ -63,7 +63,7 @@ QString m_path; QString m_error; bool m_cancelled; - int m_processed; + sv_frame_t m_processed; int m_completion; WavFileReader *m_original;