comparison data/fileio/OggVorbisFileReader.h @ 1126:39019ce29178 tony-2.0-integration

Merge through to branch for Tony 2.0

 class OggVorbisFileReader : public CodedAudioFileReader
 {
     Q_OBJECT
 
 public:
-    enum DecodeMode {
-        DecodeAtOnce, // decode the file on construction, with progress 
-        DecodeThreaded // decode in a background thread after construction
-    };
-
     OggVorbisFileReader(FileSource source,
                         DecodeMode decodeMode,
                         CacheMode cacheMode,
                         sv_samplerate_t targetRate = 0,
                         bool normalised = false,
-                        ProgressReporter *reporter = 0);
+                        ProgressReporter *reporter = nullptr);
     virtual ~OggVorbisFileReader();
 
     virtual QString getError() const { return m_error; }
 
     virtual QString getLocation() const { return m_source.getLocation(); }