comparison framework/MainWindowBase.cpp @ 76:2da0999dac1d

* 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 58bfaaed07ed
comparison
equal deleted inserted replaced
75:d184cd01760c 76:2da0999dac1d
792 } 792 }
793 793
794 MainWindowBase::FileOpenStatus 794 MainWindowBase::FileOpenStatus
795 MainWindowBase::open(QString fileOrUrl, AudioFileOpenMode mode) 795 MainWindowBase::open(QString fileOrUrl, AudioFileOpenMode mode)
796 { 796 {
797 return open(FileSource(fileOrUrl, true), mode); 797 return open(FileSource(fileOrUrl, FileSource::ProgressDialog), mode);
798 } 798 }
799 799
800 MainWindowBase::FileOpenStatus 800 MainWindowBase::FileOpenStatus
801 MainWindowBase::open(FileSource source, AudioFileOpenMode mode) 801 MainWindowBase::open(FileSource source, AudioFileOpenMode mode)
802 { 802 {
1034 bool someSuccess = false; 1034 bool someSuccess = false;
1035 1035
1036 for (PlaylistFileReader::Playlist::const_iterator i = playlist.begin(); 1036 for (PlaylistFileReader::Playlist::const_iterator i = playlist.begin();
1037 i != playlist.end(); ++i) { 1037 i != playlist.end(); ++i) {
1038 1038
1039 FileOpenStatus status = openAudio(FileSource(*i, true), mode); 1039 FileOpenStatus status = openAudio
1040 (FileSource(*i, FileSource::ProgressDialog), mode);
1040 1041
1041 if (status == FileOpenCancelled) { 1042 if (status == FileOpenCancelled) {
1042 return FileOpenCancelled; 1043 return FileOpenCancelled;
1043 } 1044 }
1044 1045
1196 } 1197 }
1197 1198
1198 MainWindowBase::FileOpenStatus 1199 MainWindowBase::FileOpenStatus
1199 MainWindowBase::openSessionFile(QString fileOrUrl) 1200 MainWindowBase::openSessionFile(QString fileOrUrl)
1200 { 1201 {
1201 return openSession(FileSource(fileOrUrl, true)); 1202 return openSession(FileSource(fileOrUrl, FileSource::ProgressDialog));
1202 } 1203 }
1203 1204
1204 MainWindowBase::FileOpenStatus 1205 MainWindowBase::FileOpenStatus
1205 MainWindowBase::openSession(FileSource source) 1206 MainWindowBase::openSession(FileSource source)
1206 { 1207 {