[Sv1-commits] SF.net SVN: sv1: [932] vect/trunk

[<ca...@us...>]

Revision: 932
          http://sv1.svn.sourceforge.net/sv1/?rev=932&view=rev
Author:   cannam
Date:     2008-01-24 07:11:37 -0800 (Thu, 24 Jan 2008)

Log Message:
-----------

* Update to build with latest SV code

Modified Paths:
--------------
    vect/trunk/main/MainWindow.cpp
    vect/trunk/main/MainWindow.h
    vect/trunk/vect.pro

Modified: vect/trunk/main/MainWindow.cpp
===================================================================
--- vect/trunk/main/MainWindow.cpp	2008-01-24 14:40:48 UTC (rev 931)
+++ vect/trunk/main/MainWindow.cpp	2008-01-24 15:11:37 UTC (rev 932)
@@ -1774,24 +1774,71 @@
 }
 
 void
-MainWindow::modelGenerationFailed(QString transformName)
+MainWindow::modelGenerationFailed(QString transformName, QString message)
 {
+    if (message != "") {
+
+        QMessageBox::warning
+            (this,
+             tr("Failed to generate layer"),
+             tr("<b>Layer generation failed</b><p>Failed to generate derived layer.<p>The layer transform \"%1\" failed:<p>%2")
+             .arg(transformName).arg(message),
+             QMessageBox::Ok);
+    } else {
+        QMessageBox::warning
+            (this,
+             tr("Failed to generate layer"),
+             tr("<b>Layer generation failed</b><p>Failed to generate a derived layer.<p>The layer transform \"%1\" failed.<p>No error information is available.")
+             .arg(transformName),
+             QMessageBox::Ok);
+    }
+}
+
+void
+MainWindow::modelGenerationWarning(QString transformName, QString message)
+{
     QMessageBox::warning
-        (this,
-         tr("Failed to generate layer"),
-         tr("Failed to generate a derived layer.\n\nThe layer transform \"%1\" failed.\n\nThis probably means that a plugin failed to initialise, perhaps because it\nrejected the processing block size that was requested.")
-         .arg(transformName),
-         QMessageBox::Ok);
+        (this, tr("Warning"), message, QMessageBox::Ok);
 }
 
 void
-MainWindow::modelRegenerationFailed(QString layerName, QString transformName)
+MainWindow::modelRegenerationFailed(QString layerName,
+                                    QString transformName, QString message)
 {
+    if (message != "") {
+
+        QMessageBox::warning
+            (this,
+             tr("Failed to regenerate layer"),
+             tr("<b>Layer generation failed</b><p>Failed to regenerate derived layer \"%1\" using new data model as input.<p>The layer transform \"%2\" failed:<p>%3")
+             .arg(layerName).arg(transformName).arg(message),
+             QMessageBox::Ok);
+    } else {
+        QMessageBox::warning
+            (this,
+             tr("Failed to regenerate layer"),
+             tr("<b>Layer generation failed</b><p>Failed to regenerate derived layer \"%1\" using new data model as input.<p>The layer transform \"%2\" failed.<p>No error information is available.")
+             .arg(layerName).arg(transformName),
+             QMessageBox::Ok);
+    }
+}
+
+void
+MainWindow::modelRegenerationWarning(QString layerName,
+                                     QString transformName, QString message)
+{
     QMessageBox::warning
+        (this, tr("Warning"), tr("<b>Warning when regenerating layer</b><p>When regenerating the derived layer \"%1\" using new data model as input:<p>%2").arg(layerName).arg(message), QMessageBox::Ok);
+}
+
+void
+MainWindow::alignmentFailed(QString transformName, QString message)
+{
+    QMessageBox::warning
         (this,
-         tr("Failed to regenerate layer"),
-         tr("Failed to regenerate derived layer \"%1\".\n\nThe layer transform \"%2\" failed to run.\n\nThis probably means the layer used a plugin that is not currently available.")
-         .arg(layerName).arg(transformName),
+         tr("Failed to calculate alignment"),
+         tr("<b>Alignment calculation failed</b><p>Failed to calculate an audio alignment using transform \"%1\":<p>%2")
+         .arg(transformName).arg(message),
          QMessageBox::Ok);
 }
 

Modified: vect/trunk/main/MainWindow.h
===================================================================
--- vect/trunk/main/MainWindow.h	2008-01-24 14:40:48 UTC (rev 931)
+++ vect/trunk/main/MainWindow.h	2008-01-24 15:11:37 UTC (rev 932)
@@ -119,8 +119,11 @@
     virtual void modelAdded(Model *);
     virtual void modelAboutToBeDeleted(Model *);
 
-    virtual void modelGenerationFailed(QString);
-    virtual void modelRegenerationFailed(QString, QString);
+    virtual void modelGenerationFailed(QString, QString);
+    virtual void modelGenerationWarning(QString, QString);
+    virtual void modelRegenerationFailed(QString, QString, QString);
+    virtual void modelRegenerationWarning(QString, QString, QString);
+    virtual void alignmentFailed(QString, QString);
 
     virtual void rightButtonMenuRequested(Pane *, QPoint point);
 

Modified: vect/trunk/vect.pro
===================================================================
--- vect/trunk/vect.pro	2008-01-24 14:40:48 UTC (rev 931)
+++ vect/trunk/vect.pro	2008-01-24 15:11:37 UTC (rev 932)
@@ -1,7 +1,7 @@
 
 TEMPLATE = app
 
-SV_UNIT_PACKAGES = vamp vamp-hostsdk fftw3f samplerate jack portaudio mad id3tag oggz fishsound lrdf raptor sndfile liblo
+SV_UNIT_PACKAGES = vamp vamp-hostsdk fftw3f samplerate jack portaudio mad id3tag oggz fishsound lrdf raptor sndfile liblo rubberband
 load(../sonic-visualiser/sv.prf)
 
 CONFIG += release sv qt thread warn_on stl rtti exceptions


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.