Mercurial > hg > svcore
diff data/fileio/AudioFileReaderFactory.cpp @ 1069:32ab6c48efaa
Merge from branch tonioni
| author | Chris Cannam |
|---|---|
| date | Mon, 20 Apr 2015 09:11:34 +0100 |
| parents | a1cd5abcb38b |
| children | abc309f507ae 5b463c7727e5 |
line wrap: on
line diff
--- a/data/fileio/AudioFileReaderFactory.cpp Mon Mar 02 17:21:34 2015 +0000 +++ b/data/fileio/AudioFileReaderFactory.cpp Mon Apr 20 09:11:34 2015 +0100 @@ -59,7 +59,7 @@ AudioFileReader * AudioFileReaderFactory::createReader(FileSource source, - int targetRate, + sv_samplerate_t targetRate, bool normalised, ProgressReporter *reporter) { @@ -68,7 +68,7 @@ AudioFileReader * AudioFileReaderFactory::createThreadingReader(FileSource source, - int targetRate, + sv_samplerate_t targetRate, bool normalised, ProgressReporter *reporter) { @@ -77,7 +77,7 @@ AudioFileReader * AudioFileReaderFactory::create(FileSource source, - int targetRate, + sv_samplerate_t targetRate, bool normalised, bool threading, ProgressReporter *reporter) @@ -105,7 +105,7 @@ reader = new WavFileReader(source); - int fileRate = reader->getSampleRate(); + sv_samplerate_t fileRate = reader->getSampleRate(); if (reader->isOK() && (!reader->isQuicklySeekable() || @@ -224,7 +224,7 @@ reader = new WavFileReader(source); - int fileRate = reader->getSampleRate(); + sv_samplerate_t fileRate = reader->getSampleRate(); if (reader->isOK() && (!reader->isQuicklySeekable() ||