Mercurial > hg > svcore
comparison data/fileio/AudioFileReaderFactory.cpp @ 935:f960d67ce842 tonioni
Merge from branch warnfix_no_size_t
author | Chris Cannam |
---|---|
date | Wed, 18 Jun 2014 13:42:01 +0100 |
parents | d03b3d956358 |
children | a1cd5abcb38b |
comparison
equal
deleted
inserted
replaced
925:3efc20c59a94 | 935:f960d67ce842 |
---|---|
57 return rv; | 57 return rv; |
58 } | 58 } |
59 | 59 |
60 AudioFileReader * | 60 AudioFileReader * |
61 AudioFileReaderFactory::createReader(FileSource source, | 61 AudioFileReaderFactory::createReader(FileSource source, |
62 size_t targetRate, | 62 int targetRate, |
63 bool normalised, | 63 bool normalised, |
64 ProgressReporter *reporter) | 64 ProgressReporter *reporter) |
65 { | 65 { |
66 return create(source, targetRate, normalised, false, reporter); | 66 return create(source, targetRate, normalised, false, reporter); |
67 } | 67 } |
68 | 68 |
69 AudioFileReader * | 69 AudioFileReader * |
70 AudioFileReaderFactory::createThreadingReader(FileSource source, | 70 AudioFileReaderFactory::createThreadingReader(FileSource source, |
71 size_t targetRate, | 71 int targetRate, |
72 bool normalised, | 72 bool normalised, |
73 ProgressReporter *reporter) | 73 ProgressReporter *reporter) |
74 { | 74 { |
75 return create(source, targetRate, normalised, true, reporter); | 75 return create(source, targetRate, normalised, true, reporter); |
76 } | 76 } |
77 | 77 |
78 AudioFileReader * | 78 AudioFileReader * |
79 AudioFileReaderFactory::create(FileSource source, | 79 AudioFileReaderFactory::create(FileSource source, |
80 size_t targetRate, | 80 int targetRate, |
81 bool normalised, | 81 bool normalised, |
82 bool threading, | 82 bool threading, |
83 ProgressReporter *reporter) | 83 ProgressReporter *reporter) |
84 { | 84 { |
85 QString err; | 85 QString err; |