comparison data/fileio/OggVorbisFileReader.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.

 
 #ifdef HAVE_OGGZ
 #ifdef HAVE_FISHSOUND
 
 #include "OggVorbisFileReader.h"
-#include "ProgressPrinter.h"
-
+
+#include "base/ProgressReporter.h"
 #include "base/Profiler.h"
 #include "system/System.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
 #include <fcntl.h>
 #include <cmath>
 
-#include <QApplication>
 #include <QFileInfo>
-#include <QProgressDialog>
 
 static int instances = 0;
 
 OggVorbisFileReader::OggVorbisFileReader(FileSource source,
                                          DecodeMode decodeMode,
                                          CacheMode mode,
-                                         size_t targetRate) :
+                                         size_t targetRate,
+                                         ProgressReporter *reporter) :
     CodedAudioFileReader(mode, targetRate),
     m_source(source),
     m_path(source.getLocalFilename()),
-    m_progress(0),
+    m_reporter(reporter),
     m_fileSize(0),
     m_bytesRead(0),
     m_commentsRead(false),
     m_cancelled(false),
     m_completion(0),

     fish_sound_set_decoded_callback(m_fishSound, acceptFrames, this);
     oggz_set_read_callback(m_oggz, -1, readPacket, this);
 
     if (decodeMode == DecodeAtOnce) {
 
-        if (dynamic_cast<QApplication *>(QCoreApplication::instance())) {
-            m_progress = new QProgressDialog
-                (QObject::tr("Decoding %1...").arg(QFileInfo(m_path).fileName()),
-                 QObject::tr("Stop"), 0, 100);
-            m_progress->hide();
-        } else {
-            ProgressPrinter *pp = new ProgressPrinter(tr("Decoding..."), this);
-            connect(this, SIGNAL(progress(int)), pp, SLOT(progress(int)));
+        if (m_reporter) {
+            connect(m_reporter, SIGNAL(cancelled()), this, SLOT(cancelled()));
+            m_reporter->setMessage
+                (tr("Decoding %1...").arg(QFileInfo(m_path).fileName()));
         }
 
         while (oggz_read(m_oggz, 1024) > 0);
         
         fish_sound_delete(m_fishSound);

         oggz_close(m_oggz);
         m_oggz = 0;
 
         if (isDecodeCacheInitialised()) finishDecodeCache();
 
-        delete m_progress;
-        m_progress = 0;
-
     } else {
+
+        if (m_reporter) m_reporter->setProgress(100);
 
         while (oggz_read(m_oggz, 1024) > 0 &&
                (m_channelCount == 0 || m_fileRate == 0 || m_sampleRate == 0));
 
         if (m_channelCount > 0) {

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

                   double(reader->m_fileSize));
     if (p > 99) p = 99;
     reader->m_completion = p;
     reader->progress(p);
 
-    if (reader->m_fileSize > 0 && reader->m_progress) {
-	if (p > reader->m_progress->value()) {
-	    reader->m_progress->setValue(p);
-	    reader->m_progress->show();
-	    reader->m_progress->raise();
-	    qApp->processEvents();
-	    if (reader->m_progress->wasCanceled()) {
-		reader->m_cancelled = true;
-	    }
-	}
+    if (reader->m_fileSize > 0 && reader->m_reporter) {
+        reader->m_reporter->setProgress(p);
     }
 
     if (reader->m_cancelled) return 1;
     return 0;
 }