Mercurial > hg > svcore
diff 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 |
line wrap: on
line diff
--- a/data/fileio/MP3FileReader.cpp Tue Oct 18 14:03:35 2016 +0100 +++ b/data/fileio/MP3FileReader.cpp Thu Oct 20 11:16:22 2016 +0100 @@ -27,7 +27,6 @@ #include <iostream> #include <cstdlib> -#include <unistd.h> #ifdef HAVE_ID3TAG #include <id3tag.h> @@ -37,6 +36,11 @@ #include <QFileInfo> +#ifdef _MSC_VER +#include <io.h> +#define open _open +#endif + MP3FileReader::MP3FileReader(FileSource source, DecodeMode decodeMode, CacheMode mode, sv_samplerate_t targetRate, bool normalised,