comparison data/fileio/ResamplingWavFileReader.cpp @ 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 "ResamplingWavFileReader.h"
 
 #include "WavFileReader.h"
 #include "base/Profiler.h"
+#include "base/ProgressReporter.h"
 
-#include <QProgressDialog>
 #include <QFileInfo>
-#include <QApplication>
 
 ResamplingWavFileReader::ResamplingWavFileReader(FileSource source,
 						 ResampleMode resampleMode,
 						 CacheMode mode,
-						 size_t targetRate) :
+						 size_t targetRate,
+                                                 ProgressReporter *reporter) :
     CodedAudioFileReader(mode, targetRate),
     m_source(source),
     m_path(source.getLocalFilename()),
     m_cancelled(false),
     m_processed(0),
     m_completion(0),
     m_original(0),
-    m_progress(0),
+    m_reporter(reporter),
     m_decodeThread(0)
 {
     m_channelCount = 0;
     m_fileRate = 0;
 

 
     initialiseDecodeCache();
 
     if (resampleMode == ResampleAtOnce) {
 
-        if (dynamic_cast<QApplication *>(QCoreApplication::instance())) {
-            m_progress = new QProgressDialog
-                (QObject::tr("Resampling %1...").arg(QFileInfo(m_path).fileName()),
-                 QObject::tr("Stop"), 0, 100);
-            m_progress->hide();
+        if (m_reporter) {
+            connect(m_reporter, SIGNAL(cancelled()), this, SLOT(cancelled()));
+            m_reporter->setMessage
+                (tr("Resampling %1...").arg(QFileInfo(m_path).fileName()));
         }
 
         size_t blockSize = 16384;
         size_t total = m_original->getFrameCount();
 

         if (isDecodeCacheInitialised()) finishDecodeCache();
 
         delete m_original;
         m_original = 0;
 
-        delete m_progress;
-        m_progress = 0;
+    } else {
 
-    } else {
+        if (m_reporter) m_reporter->setProgress(100);
 
         m_decodeThread = new DecodeThread(this);
         m_decodeThread->start();
     }
 }

         m_decodeThread->wait();
         delete m_decodeThread;
     }
     
     delete m_original;
+}
+
+void
+ResamplingWavFileReader::cancelled()
+{
+    m_cancelled = true;
 }
 
 void
 ResamplingWavFileReader::DecodeThread::run()
 {

                          float(m_original->getFrameCount()));
 
     if (progress > 99) progress = 99;
     m_completion = progress;
     
-    if (m_progress) {
-	if (progress > m_progress->value()) {
-	    m_progress->setValue(progress);
-	    m_progress->show();
-	    m_progress->raise();
-	    qApp->processEvents();
-	    if (m_progress->wasCanceled()) {
-		m_cancelled = true;
-	    }
-	}
+    if (m_reporter) {
+        m_reporter->setProgress(progress);
     }
 }
 
 void
 ResamplingWavFileReader::getSupportedExtensions(std::set<QString> &extensions)