Mercurial > hg > svcore
diff data/fileio/CodedAudioFileReader.h @ 1359:1c9bbbb6116a 3.0-integration
Use W64 instead of WAV for decoded files; use Ogg reader in preference to WAV one for Ogg files (WAV reader works, via libsndfile, but doesn't load metadata); fix Ogg reader to use QFile open instead of non-Win32-compatible API; add more encoder tests, audio writer test, midi reader test
author | Chris Cannam |
---|---|
date | Tue, 10 Jan 2017 10:58:25 +0000 |
parents | 54af1e21705c |
children | c01cbe41aeb5 |
line wrap: on
line diff
--- a/data/fileio/CodedAudioFileReader.h Mon Jan 09 18:51:42 2017 +0000 +++ b/data/fileio/CodedAudioFileReader.h Tue Jan 10 10:58:25 2017 +0000 @@ -13,15 +13,21 @@ COPYING included with this distribution for more information. */ -#ifndef _CODED_AUDIO_FILE_READER_H_ -#define _CODED_AUDIO_FILE_READER_H_ +#ifndef SV_CODED_AUDIO_FILE_READER_H +#define SV_CODED_AUDIO_FILE_READER_H #include "AudioFileReader.h" -#include <sndfile.h> #include <QMutex> #include <QReadWriteLock> +#ifdef Q_OS_WIN +#include <windows.h> +#define ENABLE_SNDFILE_WINDOWS_PROTOTYPES 1 +#endif + +#include <sndfile.h> + class WavFileReader; class Serialiser;