Mercurial > hg > svcore
diff data/fileio/OggVorbisFileReader.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 | abc309f507ae |
children | c01cbe41aeb5 |
line wrap: on
line diff
--- a/data/fileio/OggVorbisFileReader.h Mon Jan 09 18:51:42 2017 +0000 +++ b/data/fileio/OggVorbisFileReader.h Tue Jan 10 10:58:25 2017 +0000 @@ -13,8 +13,8 @@ COPYING included with this distribution for more information. */ -#ifndef _OGG_VORBIS_FILE_READER_H_ -#define _OGG_VORBIS_FILE_READER_H_ +#ifndef SV_OGG_VORBIS_FILE_READER_H +#define SV_OGG_VORBIS_FILE_READER_H #ifdef HAVE_OGGZ #ifdef HAVE_FISHSOUND @@ -25,6 +25,8 @@ #include <oggz/oggz.h> #include <fishsound/fishsound.h> +#include <cstdio> + #include <set> class ProgressReporter; @@ -71,6 +73,8 @@ QString m_maker; TagMap m_tags; + QFile *m_qfile; + FILE *m_ffile; OGGZ *m_oggz; FishSound *m_fishSound; ProgressReporter *m_reporter;