Mercurial > hg > svcore
comparison data/fileio/QuickTimeFileReader.cpp @ 936:0c1d6de8f44b
Merge from branch warnfix_no_size_t
| author | Chris Cannam |
|---|---|
| date | Wed, 18 Jun 2014 13:51:16 +0100 |
| parents | d03b3d956358 |
| children | a1cd5abcb38b |
comparison
equal
deleted
inserted
replaced
| 917:49618f39ff09 | 936:0c1d6de8f44b |
|---|---|
| 41 AudioBufferList buffer; | 41 AudioBufferList buffer; |
| 42 float *data; | 42 float *data; |
| 43 OSErr err; | 43 OSErr err; |
| 44 AudioStreamBasicDescription asbd; | 44 AudioStreamBasicDescription asbd; |
| 45 Movie movie; | 45 Movie movie; |
| 46 size_t blockSize; | 46 int blockSize; |
| 47 }; | 47 }; |
| 48 | 48 |
| 49 | 49 |
| 50 QuickTimeFileReader::QuickTimeFileReader(FileSource source, | 50 QuickTimeFileReader::QuickTimeFileReader(FileSource source, |
| 51 DecodeMode decodeMode, | 51 DecodeMode decodeMode, |
| 52 CacheMode mode, | 52 CacheMode mode, |
| 53 size_t targetRate, | 53 int targetRate, |
| 54 bool normalised, | |
| 54 ProgressReporter *reporter) : | 55 ProgressReporter *reporter) : |
| 55 CodedAudioFileReader(mode, targetRate), | 56 CodedAudioFileReader(mode, targetRate, normalised), |
| 56 m_source(source), | 57 m_source(source), |
| 57 m_path(source.getLocalFilename()), | 58 m_path(source.getLocalFilename()), |
| 58 m_d(new D), | 59 m_d(new D), |
| 59 m_reporter(reporter), | 60 m_reporter(reporter), |
| 60 m_cancelled(false), | 61 m_cancelled(false), |