comparison data/fileio/OggVorbisFileReader.h @ 1527:710e6250a401 zoom

Merge from default branch

     published by the Free Software Foundation; either version 2 of the
     License, or (at your option) any later version.  See the file
     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
 
 #include "CodedAudioFileReader.h"
 
 #include "base/Thread.h"
 #include <oggz/oggz.h>
 #include <fishsound/fishsound.h>
+
+#include <cstdio>
 
 #include <set>
 
 class ProgressReporter;
 

     QString m_error;
     QString m_title;
     QString m_maker;
     TagMap m_tags;
 
+    QFile *m_qfile;
+    FILE *m_ffile;
     OGGZ *m_oggz;
     FishSound *m_fishSound;
     ProgressReporter *m_reporter;
     sv_frame_t m_fileSize;
     sv_frame_t m_bytesRead;