Mercurial > hg > sonic-visualiser
changeset 1151:e0aa911e1a8a 3.0-integration
Update subrepos
| author | Chris Cannam |
|---|---|
| date | Fri, 22 Apr 2016 11:15:46 +0100 |
| parents | 3ba5bee2ace0 |
| children | 2e83525cf638 |
| files | .hgsubstate main/MainWindow.cpp main/MainWindow.h |
| diffstat | 3 files changed, 7 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgsubstate Fri Apr 15 16:26:15 2016 +0100 +++ b/.hgsubstate Fri Apr 22 11:15:46 2016 +0100 @@ -5,7 +5,7 @@ d16f0fd6db6104d87882bc43788a3bb1b0f8c528 dataquay 68ae618c6b0e442d08a71d39217784a08f2a8de3 icons/scalable 1e4f338ae482429a7ab9bdd0825242042354152f sv-dependency-builds -f7ec9e410108fe08580cf61e328b73fe8c7e4e1d svapp -a1f410f895d3edf8008067a57d86f92b5da278de svcore -3691af49291c57a31883fd27190586737935b12b svgui +c3648c667a0bb9004c97f1997dca22b79c419e12 svapp +e5a1d815f331275aae137af37e13766c69814e5c svcore +834e94eb1bca69d909de029705ec3d4b8b7f3204 svgui 9a2998401bbe0a7b9e3233eeca5004542bc0014d vamp-plugin-sdk
--- a/main/MainWindow.cpp Fri Apr 15 16:26:15 2016 +0100 +++ b/main/MainWindow.cpp Fri Apr 22 11:15:46 2016 +0100 @@ -4436,15 +4436,13 @@ } void -MainWindow::alignmentFailed(QString transformName, QString message) +MainWindow::alignmentFailed(QString message) { - emit hideSplash(); - QMessageBox::warning (this, 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), + tr("<b>Alignment calculation failed</b><p>Failed to calculate an audio alignment:<p>%1") + .arg(message), QMessageBox::Ok); }
--- a/main/MainWindow.h Fri Apr 15 16:26:15 2016 +0100 +++ b/main/MainWindow.h Fri Apr 22 11:15:46 2016 +0100 @@ -93,7 +93,7 @@ virtual void modelGenerationWarning(QString, QString); virtual void modelRegenerationFailed(QString, QString, QString); virtual void modelRegenerationWarning(QString, QString, QString); - virtual void alignmentFailed(QString, QString); + virtual void alignmentFailed(QString); virtual void rightButtonMenuRequested(Pane *, QPoint point);