Mercurial > hg > tony
changeset 520:30fbc53d8150
Merge latest SV 3.0 branch code
| author | Chris Cannam |
|---|---|
| date | Fri, 19 Aug 2016 15:58:57 +0100 |
| parents | 34668179c803 |
| children | 25aa28a27252 |
| files | .hgsubstate src/Analyser.cpp src/MainWindow.cpp src/MainWindow.h src/main.cpp tony.pro tonyapp.pro |
| diffstat | 7 files changed, 46 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgsubstate Sat Jan 30 12:13:45 2016 +0000 +++ b/.hgsubstate Fri Aug 19 15:58:57 2016 +0100 @@ -1,11 +1,11 @@ -e09d3c02709624b266b62b63a6218d4f330b677e bqaudioio -576a130debf70b3a57c9189bfa1de64d8f64dc14 bqresample -b5c7ca480bf7dc5c602e456480d53ecce3d58e42 bqvec +fd86e70e00ae923479609a7e53d6481c09a76791 bqaudioio +6b0cbfca8fb7cf64f89b0a0026b63bc212b156af bqresample +126afd8e6a38eec4a201d63af28e271b6edb74cb bqvec 456842723db65e5553e3506a8fedc8f21d9ea537 chp -d16f0fd6db6104d87882bc43788a3bb1b0f8c528 dataquay -cbb548cfe0330f450a042e79f69987d8847d1c42 icons/scalable +896aefe629c85b05ae0880ec93a396b9e3a5a304 dataquay +68ae618c6b0e442d08a71d39217784a08f2a8de3 icons/scalable 5c1572dd225a7fa23b520219ce4515961aafa7a5 pyin 55ece8862b6d3a54aad271a53f9c1615e5d3bcf8 sv-dependency-builds -83c60632bac02efd174220f2db8e14786cf57972 svapp -e94719f941ba86d53732cd872904ab6193b2c5b2 svcore -96cf499fad621fb15e4d9d4103da1dfd7f73d9e9 svgui +169aa5203faa0f1762961311e5bbe187df63fd16 svapp +659372323b45f19c5707942ef1c7cffb391efe82 svcore +c0d841cb8ab957816c44ea1a881bb778eea22f49 svgui
--- a/src/Analyser.cpp Sat Jan 30 12:13:45 2016 +0000 +++ b/src/Analyser.cpp Fri Aug 19 15:58:57 2016 +0100 @@ -277,7 +277,7 @@ (m_document->createMainModelLayer(LayerFactory::MelodicRangeSpectrogram)); spectrogram->setColourMap((int)ColourMapper::BlackOnWhite); - spectrogram->setNormalization(SpectrogramLayer::NormalizeHybrid); + spectrogram->setNormalization(ColumnNormalization::Hybrid); // This magical-looking scale factor happens to get us an // identical display to Tony v1.0 spectrogram->setGain(100.f / 4096.f);
--- a/src/MainWindow.cpp Sat Jan 30 12:13:45 2016 +0000 +++ b/src/MainWindow.cpp Fri Aug 19 15:58:57 2016 +0100 @@ -3135,13 +3135,13 @@ } void -MainWindow::alignmentFailed(QString transformName, QString message) +MainWindow::alignmentFailed(QString message) { 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/src/MainWindow.h Sat Jan 30 12:13:45 2016 +0000 +++ b/src/MainWindow.h Fri Aug 19 15:58:57 2016 +0100 @@ -143,7 +143,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);
--- a/src/main.cpp Sat Jan 30 12:13:45 2016 +0000 +++ b/src/main.cpp Fri Aug 19 15:58:57 2016 +0100 @@ -23,6 +23,7 @@ #include "widgets/TipDialog.h" #include "widgets/InteractiveFileFinder.h" #include "transform/TransformFactory.h" +#include "svcore/plugin/PluginScan.h" #include <QMetaType> #include <QApplication> @@ -243,6 +244,28 @@ StoreStartupLocale(); + // Make known-plugins query as early as possible. This depends on + // our helper executable, which must exist either in the same + // directory as this one or (preferably) a subdirectory called + // "checker". + QString myDir = application.applicationDirPath(); + QString helperPath = myDir + "/checker/plugin-checker-helper"; + QString helperSuffix = ""; +#ifdef _WIN32 + helperSuffix = ".exe"; +#endif + if (!QFile(helperPath + helperSuffix).exists()) { + cerr << "NOTE: helper not found at " << (helperPath + helperSuffix) + << ", trying in my own directory" << endl; + helperPath = myDir + "/plugin-checker-helper"; + } + helperPath += helperSuffix; + if (!QFile(helperPath + helperSuffix).exists()) { + cerr << "NOTE: helper not found at " << (helperPath + helperSuffix) + << endl; + } + PluginScan::getInstance()->scan(helperPath); + // Permit size_t and PropertyName to be used as args in queued signal calls qRegisterMetaType<size_t>("size_t"); qRegisterMetaType<PropertyContainer::PropertyName>("PropertyContainer::PropertyName");
--- a/tony.pro Sat Jan 30 12:13:45 2016 +0000 +++ b/tony.pro Fri Aug 19 15:58:57 2016 +0100 @@ -1,5 +1,5 @@ TEMPLATE = subdirs -SUBDIRS = sub_bq sub_dataquay svcore svgui svapp sub_tony +SUBDIRS = sub_bq sub_dataquay svcore svgui svapp checker sub_tony sub_bq.file = bq.pro sub_tony.file = tonyapp.pro
--- a/tonyapp.pro Sat Jan 30 12:13:45 2016 +0000 +++ b/tonyapp.pro Fri Aug 19 15:58:57 2016 +0100 @@ -55,15 +55,15 @@ contains(DEFINES, BUILD_STATIC):LIBS -= -ljack -MY_LIBS = -Lsvapp -Lsvgui -Lsvcore -Ldataquay -L. \ - -lsvapp -lsvgui -lsvcore -ldataquay -lbq +MY_LIBS = -Lsvapp -Lsvgui -Lsvcore -Lchecker -Ldataquay -L. \ + -lsvapp -lsvgui -lsvcore -lchecker -ldataquay -lbq linux* { MY_LIBS = -Wl,-Bstatic $$MY_LIBS -Wl,-Bdynamic } win* { -MY_LIBS = -Lsvapp/release -Lsvgui/release -Lsvcore/release -Ldataquay/release -Lrelease $$MY_LIBS +MY_LIBS = -Lsvapp/release -Lsvgui/release -Lsvcore/release -Lchecker/release -Ldataquay/release -Lrelease $$MY_LIBS } LIBS = $$MY_LIBS $$LIBS @@ -72,21 +72,24 @@ PRE_TARGETDEPS += svapp/svapp.lib \ svgui/svgui.lib \ svcore/svcore.lib \ - dataquay/dataquay.lib + dataquay/dataquay.lib \ + checker/checker.lib } win32-g++ { PRE_TARGETDEPS += svapp/release/libsvapp.a \ svgui/release/libsvgui.a \ svcore/release/libsvcore.a \ - dataquay/release/libdataquay.a + dataquay/release/libdataquay.a \ + checker/release/libchecker.a } !win* { PRE_TARGETDEPS += svapp/libsvapp.a \ svgui/libsvgui.a \ svcore/libsvcore.a \ - dataquay/libdataquay.a + dataquay/libdataquay.a \ + checker/libchecker.a } RESOURCES += tony.qrc