Mercurial > hg > svapp

changeset 76:2da0999dac1d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* better progress reporting in FileSource * fix set-to-default for audio dials with mappers
author Chris Cannam
date Fri, 04 Jan 2008 17:08:10 +0000
parents d184cd01760c
children 0535c49069ba
files framework/MainWindowBase.cpp framework/SVFileReader.cpp
diffstat 2 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/framework/MainWindowBase.cpp	Thu Dec 13 18:06:22 2007 +0000
+++ b/framework/MainWindowBase.cpp	Fri Jan 04 17:08:10 2008 +0000
@@ -794,7 +794,7 @@
 MainWindowBase::FileOpenStatus
 MainWindowBase::open(QString fileOrUrl, AudioFileOpenMode mode)
 {
-    return open(FileSource(fileOrUrl, true), mode);
+    return open(FileSource(fileOrUrl, FileSource::ProgressDialog), mode);
 }
 
 MainWindowBase::FileOpenStatus
@@ -1036,7 +1036,8 @@
     for (PlaylistFileReader::Playlist::const_iterator i = playlist.begin();
          i != playlist.end(); ++i) {
 
-        FileOpenStatus status = openAudio(FileSource(*i, true), mode);
+        FileOpenStatus status = openAudio
+            (FileSource(*i, FileSource::ProgressDialog), mode);
 
         if (status == FileOpenCancelled) {
             return FileOpenCancelled;
@@ -1198,7 +1199,7 @@
 MainWindowBase::FileOpenStatus
 MainWindowBase::openSessionFile(QString fileOrUrl)
 {
-    return openSession(FileSource(fileOrUrl, true));
+    return openSession(FileSource(fileOrUrl, FileSource::ProgressDialog));
 }
 
 MainWindowBase::FileOpenStatus
--- a/framework/SVFileReader.cpp	Thu Dec 13 18:06:22 2007 +0000
+++ b/framework/SVFileReader.cpp	Fri Jan 04 17:08:10 2008 +0000
@@ -430,7 +430,7 @@
         QString path = ff->find(FileFinder::AudioFile,
                                 originalPath, m_location);
 
-        FileSource file(path, true);
+        FileSource file(path, FileSource::ProgressDialog);
         file.waitForStatus();
 
         if (!file.isOK()) {