comparison data/fileio/ResamplingWavFileReader.h @ 392:183ee2a55fc7

* More work to abstract out interactive components used in the data library,
  so that it does not need to depend on QtGui.

 #include "base/Thread.h"
 
 #include <set>
 
 class WavFileReader;
-class QProgressDialog;
+class ProgressReporter;
 
 class ResamplingWavFileReader : public CodedAudioFileReader
 {
+    Q_OBJECT
 public:
     enum ResampleMode {
         ResampleAtOnce, // resample the file on construction, with progress dialog
         ResampleThreaded // resample in a background thread after construction
     };
 
     ResamplingWavFileReader(FileSource source,
                             ResampleMode resampleMode,
                             CacheMode cacheMode,
-                            size_t targetRate = 0);
+                            size_t targetRate = 0,
+                            ProgressReporter *reporter = 0);
     virtual ~ResamplingWavFileReader();
 
     virtual QString getError() const { return m_error; }
     virtual QString getLocation() const { return m_source.getLocation(); }
     static void getSupportedExtensions(std::set<QString> &extensions);

 
     virtual bool isUpdating() const {
         return m_decodeThread && m_decodeThread->isRunning();
     }
 
+public slots:
+    void cancelled();
+
 protected:
     FileSource m_source;
     QString m_path;
     QString m_error;
     bool m_cancelled;
     size_t m_processed;
     int m_completion;
 
     WavFileReader *m_original;
-    QProgressDialog *m_progress;
+    ProgressReporter *m_reporter;
 
     void addBlock(const SampleBlock &frames);
     
     class DecodeThread : public Thread
     {