comparison data/fileio/MP3FileReader.cpp @ 1221:a1b97df9962e 3.0-integration

Merge from branch msvc2015_64
author Chris Cannam
date Thu, 20 Oct 2016 11:16:22 +0100
parents 794b64e62e58
children 0a9193dc136b
comparison
equal deleted inserted replaced
1215:f50ded4b951c 1221:a1b97df9962e
25 #include <fcntl.h> 25 #include <fcntl.h>
26 26
27 #include <iostream> 27 #include <iostream>
28 28
29 #include <cstdlib> 29 #include <cstdlib>
30 #include <unistd.h>
31 30
32 #ifdef HAVE_ID3TAG 31 #ifdef HAVE_ID3TAG
33 #include <id3tag.h> 32 #include <id3tag.h>
34 #endif 33 #endif
35 34
36 //#define DEBUG_ID3TAG 1 35 //#define DEBUG_ID3TAG 1
37 36
38 #include <QFileInfo> 37 #include <QFileInfo>
38
39 #ifdef _MSC_VER
40 #include <io.h>
41 #define open _open
42 #endif
39 43
40 MP3FileReader::MP3FileReader(FileSource source, DecodeMode decodeMode, 44 MP3FileReader::MP3FileReader(FileSource source, DecodeMode decodeMode,
41 CacheMode mode, sv_samplerate_t targetRate, 45 CacheMode mode, sv_samplerate_t targetRate,
42 bool normalised, 46 bool normalised,
43 ProgressReporter *reporter) : 47 ProgressReporter *reporter) :