Mercurial > hg > svcore

diff data/fileio/CoreAudioFileReader.h @ 1126:39019ce29178 tony-2.0-integration

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge through to branch for Tony 2.0
author Chris Cannam
date Thu, 20 Aug 2015 14:54:21 +0100
parents abc309f507ae
children ad5f892c0c4d
line wrap: on
line diff
--- a/data/fileio/CoreAudioFileReader.h	Fri Aug 14 18:16:14 2015 +0100
+++ b/data/fileio/CoreAudioFileReader.h	Thu Aug 20 14:54:21 2015 +0100
@@ -31,17 +31,12 @@
     Q_OBJECT
 
 public:
-    enum DecodeMode {
-        DecodeAtOnce, // decode the file on construction, with progress
-        DecodeThreaded // decode in a background thread after construction
-    };
-
     CoreAudioFileReader(FileSource source,
                         DecodeMode decodeMode,
                         CacheMode cacheMode,
                         sv_samplerate_t targetRate = 0,
                         bool normalised = false,
-                        ProgressReporter *reporter = 0);
+                        ProgressReporter *reporter = nullptr);
     virtual ~CoreAudioFileReader();
 
     virtual QString getError() const { return m_error; }