Mercurial > hg > sonic-visualiser

changeset 270:a0d3b334e7a9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Merge revisions 1131 to 1201 from sv-rdf-import branch
author Chris Cannam
date Thu, 18 Sep 2008 12:33:30 +0000
parents 20ebdbf8f959
children 3c4aaa8f8418
files main/main.cpp sv.pro
diffstat 2 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/main/main.cpp	Thu Sep 18 12:09:32 2008 +0000
+++ b/main/main.cpp	Thu Sep 18 12:33:30 2008 +0000
@@ -358,9 +358,15 @@
             }
         }
         if (status == MainWindow::FileOpenFailed) {
+            splash.hide();
 	    QMessageBox::critical
                 (gui, QMessageBox::tr("Failed to open file"),
                  QMessageBox::tr("File or URL \"%1\" could not be opened").arg(path));
+        } else if (status == MainWindow::FileOpenWrongMode) {
+            splash.hide();
+            QMessageBox::critical
+                (gui, QMessageBox::tr("Failed to open file"),
+                 QMessageBox::tr("<b>Audio required</b><p>Please load at least one audio file before importing annotation data"));
         }
     }
     
--- a/sv.pro	Thu Sep 18 12:09:32 2008 +0000
+++ b/sv.pro	Thu Sep 18 12:33:30 2008 +0000
@@ -1,7 +1,8 @@
 
 TEMPLATE = app
 
-SV_UNIT_PACKAGES = vamp vamp-hostsdk rubberband fftw3 fftw3f samplerate jack libpulse portaudio-2.0 mad id3tag oggz fishsound lrdf sndfile liblo redland
+SV_UNIT_PACKAGES = vamp vamp-hostsdk rubberband fftw3 fftw3f samplerate jack libpulse portaudio-2.0 mad id3tag oggz fishsound lrdf rasqal raptor sndfile liblo
+
 load(../sv.prf)
 
 CONFIG += sv qt thread warn_on stl rtti exceptions