comparison data/fileio/DecodingWavFileReader.h @ 936:0c1d6de8f44b

Merge from branch warnfix_no_size_t

         ResampleAtOnce, // resample the file on construction, with progress dialog
         ResampleThreaded // resample in a background thread after construction
     };
 
     DecodingWavFileReader(FileSource source,
-                            ResampleMode resampleMode,
-                            CacheMode cacheMode,
-                            size_t targetRate = 0,
-                            ProgressReporter *reporter = 0);
+                          ResampleMode resampleMode,
+                          CacheMode cacheMode,
+                          int targetRate = 0,
+                          bool normalised = false,
+                          ProgressReporter *reporter = 0);
     virtual ~DecodingWavFileReader();
 
     virtual QString getError() const { return m_error; }
     virtual QString getLocation() const { return m_source.getLocation(); }
     static void getSupportedExtensions(std::set<QString> &extensions);

 protected:
     FileSource m_source;
     QString m_path;
     QString m_error;
     bool m_cancelled;
-    size_t m_processed;
+    int m_processed;
     int m_completion;
 
     WavFileReader *m_original;
     ProgressReporter *m_reporter;