comparison data/fileio/AudioFileReaderFactory.cpp @ 1327:7d24f92158a7 3.0-integration

QuickTime file reader is no longer used on any platform and is probably rotting. Remove it
author Chris Cannam
date Tue, 13 Dec 2016 16:06:28 +0000
parents ff9697592bef
children c0fece5e7755
comparison
equal deleted inserted replaced
1326:54af1e21705c 1327:7d24f92158a7
17 17
18 #include "WavFileReader.h" 18 #include "WavFileReader.h"
19 #include "DecodingWavFileReader.h" 19 #include "DecodingWavFileReader.h"
20 #include "OggVorbisFileReader.h" 20 #include "OggVorbisFileReader.h"
21 #include "MP3FileReader.h" 21 #include "MP3FileReader.h"
22 #include "QuickTimeFileReader.h"
23 #include "CoreAudioFileReader.h" 22 #include "CoreAudioFileReader.h"
24 #include "AudioFileSizeEstimator.h" 23 #include "AudioFileSizeEstimator.h"
25 24
26 #include "base/StorageAdviser.h" 25 #include "base/StorageAdviser.h"
27 26
40 #endif 39 #endif
41 #ifdef HAVE_OGGZ 40 #ifdef HAVE_OGGZ
42 #ifdef HAVE_FISHSOUND 41 #ifdef HAVE_FISHSOUND
43 OggVorbisFileReader::getSupportedExtensions(extensions); 42 OggVorbisFileReader::getSupportedExtensions(extensions);
44 #endif 43 #endif
45 #endif
46 #ifdef HAVE_QUICKTIME
47 QuickTimeFileReader::getSupportedExtensions(extensions);
48 #endif 44 #endif
49 #ifdef HAVE_COREAUDIO 45 #ifdef HAVE_COREAUDIO
50 CoreAudioFileReader::getSupportedExtensions(extensions); 46 CoreAudioFileReader::getSupportedExtensions(extensions);
51 #endif 47 #endif
52 48
182 delete reader; 178 delete reader;
183 } 179 }
184 } 180 }
185 #endif 181 #endif
186 182
187 #ifdef HAVE_QUICKTIME
188 if (anyReader || QuickTimeFileReader::supports(source)) {
189
190 reader = new QuickTimeFileReader
191 (source, decodeMode, cacheMode, targetRate, normalised, reporter);
192
193 if (reader->isOK()) {
194 return reader;
195 } else {
196 delete reader;
197 }
198 }
199 #endif
200
201 #ifdef HAVE_COREAUDIO 183 #ifdef HAVE_COREAUDIO
202 if (anyReader || CoreAudioFileReader::supports(source)) { 184 if (anyReader || CoreAudioFileReader::supports(source)) {
203 185
204 reader = new CoreAudioFileReader 186 reader = new CoreAudioFileReader
205 (source, decodeMode, cacheMode, targetRate, normalised, reporter); 187 (source, decodeMode, cacheMode, targetRate, normalised, reporter);