Mercurial > hg > sonic-visualiser
changeset 1144:a1ce253dc90e pluginscan
First cut running (but not yet using output of, or recovering from errors in) the plugin checker at startup
| author | Chris Cannam |
|---|---|
| date | Thu, 14 Apr 2016 12:12:04 +0100 |
| parents | 129910eddd00 |
| children | 52cbb3f6b9fa |
| files | .hgsub .hgsubstate main/main.cpp sonic-visualiser.pro sv.pro |
| diffstat | 5 files changed, 17 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgsub Fri Mar 18 14:26:06 2016 +0000 +++ b/.hgsub Thu Apr 14 12:12:04 2016 +0100 @@ -8,3 +8,4 @@ bqaudioio = https://bitbucket.org/breakfastquay/bqaudioio sv-dependency-builds = https://code.soundsoftware.ac.uk/hg/sv-dependency-builds icons/scalable = https://code.soundsoftware.ac.uk/hg/sv-iconset +vamp-plugin-load-checker = https://code.soundsoftware.ac.uk/hg/vamp-plugin-load-checker
--- a/.hgsubstate Fri Mar 18 14:26:06 2016 +0000 +++ b/.hgsubstate Thu Apr 14 12:12:04 2016 +0100 @@ -5,6 +5,7 @@ 68ae618c6b0e442d08a71d39217784a08f2a8de3 icons/scalable 1e4f338ae482429a7ab9bdd0825242042354152f sv-dependency-builds f7ec9e410108fe08580cf61e328b73fe8c7e4e1d svapp -4018fc0189bc46bf36ce1961ae558377afff2c6e svcore +bf05d9259dbce1ebf451f6a527fa0c9484bfc926 svcore 3691af49291c57a31883fd27190586737935b12b svgui -55de53d7c777008997721bb43051a67c3b3772d2 vamp-plugin-sdk +846464771d06fcfa2c279d5c1a17dbc3c9013033 vamp-plugin-load-checker +35fa4733bc5dd88418df5bb1fe2819e1e24e76e5 vamp-plugin-sdk
--- a/main/main.cpp Fri Mar 18 14:26:06 2016 +0000 +++ b/main/main.cpp Thu Apr 14 12:12:04 2016 +0100 @@ -26,6 +26,7 @@ #include "widgets/InteractiveFileFinder.h" #include "svapp/framework/TransformUserConfigurator.h" #include "transform/TransformFactory.h" +#include "svcore/plugin/PluginScan.h" #include <QMetaType> #include <QApplication> @@ -332,6 +333,10 @@ StoreStartupLocale(); + // Make known-plugins query as early as possible after showing + // splash screen + PluginScan::getInstance()->scan(); + // Permit size_t and PropertyName to be used as args in queued signal calls qRegisterMetaType<PropertyContainer::PropertyName>("PropertyContainer::PropertyName");
--- a/sonic-visualiser.pro Fri Mar 18 14:26:06 2016 +0000 +++ b/sonic-visualiser.pro Thu Apr 14 12:12:04 2016 +0100 @@ -1,5 +1,5 @@ TEMPLATE = subdirs -SUBDIRS = sub_bq sub_dataquay svcore svgui svapp sub_sv +SUBDIRS = sub_bq sub_dataquay svcore svgui svapp vamp-plugin-load-checker sub_sv !win* { # We should build and run the tests on any platform,
--- a/sv.pro Fri Mar 18 14:26:06 2016 +0000 +++ b/sv.pro Thu Apr 14 12:12:04 2016 +0100 @@ -58,15 +58,15 @@ contains(DEFINES, BUILD_STATIC):LIBS -= -ljack -MY_LIBS = -Lsvapp -Lsvgui -Lsvcore -Ldataquay -L. \ - -lsvapp -lsvgui -lsvcore -ldataquay -lbq +MY_LIBS = -Lsvapp -Lsvgui -Lsvcore -Lvamp-plugin-load-checker -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 $$MY_LIBS +MY_LIBS = -Lsvapp/release -Lsvgui/release -Lsvcore/release -Lvamp-plugin-load-checker/release -Ldataquay/release $$MY_LIBS } LIBS = $$MY_LIBS $$LIBS @@ -75,13 +75,15 @@ PRE_TARGETDEPS += svapp/release/libsvapp.a \ svgui/release/libsvgui.a \ svcore/release/libsvcore.a \ - dataquay/release/libdataquay.a + dataquay/release/libdataquay.a \ + vamp-plugin-load-checker/release/libchecker.a } !win* { PRE_TARGETDEPS += svapp/libsvapp.a \ svgui/libsvgui.a \ svcore/libsvcore.a \ - dataquay/libdataquay.a + dataquay/libdataquay.a \ + vamp-plugin-load-checker/libchecker.a } RESOURCES += sonic-visualiser.qrc