changeset 26:c89d25a0a7a7

Add VamPy
author Chris Cannam
date Wed, 11 Dec 2019 11:55:40 +0000
parents 663baf743c63
children f274e81c2e7c
files repoint-lock.json repoint-project.json vamp-plugin-pack.pro vampy.pro
diffstat 4 files changed, 74 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/repoint-lock.json	Mon Dec 09 13:56:36 2019 +0000
+++ b/repoint-lock.json	Wed Dec 11 11:55:40 2019 +0000
@@ -25,7 +25,7 @@
       "pin": "af71cbdab621"
     },
     "tipic": {
-      "pin": "6ca3c80e1f43"
+      "pin": "14823d51a573"
     },
     "tuning-difference": {
       "pin": "8fd1c994f937"
@@ -34,7 +34,7 @@
       "pin": "3faac48d491d"
     },
     "azi": {
-      "pin": "230562aa012d"
+      "pin": "39a06bc19a36"
     },
     "vamp-simple-cepstrum": {
       "pin": "a488dd5e4fb8"
@@ -70,11 +70,14 @@
       "pin": "051771c38f801682c315b84fdd1d9ec8a3c71340"
     },
     "vamp-fanchirp": {
-      "pin": "337005419d92"
+      "pin": "297eb6a19824"
     },
     "vamp-fanchirp/bqvec": {
       "pin": "cd235ecbeb31"
     },
+    "vampy": {
+      "pin": "e1d65734d953"
+    },
     "sv-dependency-builds": {
       "pin": "d0c2a83c1364"
     }
--- a/repoint-project.json	Mon Dec 09 13:56:36 2019 +0000
+++ b/repoint-project.json	Wed Dec 11 11:55:40 2019 +0000
@@ -125,6 +125,10 @@
             "service": "sourcehut",
             "owner": "breakfastquay"
         },
+        "vampy": {
+            "vcs": "hg",
+            "service": "soundsoftware"
+        },
         "sv-dependency-builds": {
             "vcs": "hg",
             "service": "soundsoftware"
--- a/vamp-plugin-pack.pro	Mon Dec 09 13:56:36 2019 +0000
+++ b/vamp-plugin-pack.pro	Wed Dec 11 11:55:40 2019 +0000
@@ -22,7 +22,8 @@
         sub_libxtract \
         sub_beatroot \
         sub_marsyas \
-        sub_fanchirp
+        sub_fanchirp \
+        sub_vampy
 
 sub_sdk.file = vamp-plugin-sdk.pro
 sub_match.file = match-vamp.pro
@@ -45,6 +46,7 @@
 sub_beatroot.file = beatroot-vamp.pro
 sub_marsyas.file = marsyas-vamp.pro
 sub_fanchirp.file = vamp-fanchirp.pro
+sub_vampy.file = vampy.pro
 
 repoint.target = $$PWD/.repoint.point
 repoint.depends = $$PWD/repoint-project.json $$PWD/repoint-lock.json
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vampy.pro	Wed Dec 11 11:55:40 2019 +0000
@@ -0,0 +1,61 @@
+
+TEMPLATE = lib
+
+exists(config.pri) {
+    include(config.pri)
+}
+
+!exists(config.pri) {
+    include(noconfig.pri)
+}
+
+CONFIG -= qt
+CONFIG += plugin no_plugin_name_prefix release warn_on
+
+TARGET = out/vampy
+
+OBJECTS_DIR = vampy/o
+
+INCLUDEPATH += $$PWD/vamp-plugin-sdk
+
+QMAKE_CXXFLAGS -= -Werror
+
+win32-msvc* {
+    LIBS += -EXPORT:vampGetPluginDescriptor
+}
+win32-g++* {
+    LIBS += -Wl,--version-script=$$PWD/vampy/vamp-plugin.map
+}
+linux* {
+    QMAKE_CXXFLAGS += -DHAVE_NUMPY \
+        -D_DEBUG -fno-strict-aliasing \
+        -I/usr/include/python2.7 \
+        -I/usr/lib/python2.7/dist-packages/numpy/core/include \
+        -I/usr/lib/python2.7/site-packages/numpy/core/include
+    LIBS += -lpython2.7 -ldl -Wl,--version-script=$$PWD/vampy/vamp-plugin.map
+}
+macx* {
+    LIBS += -exported_symbols_list $$PWD/vampy/vamp-plugin.list
+}
+!win* {
+    QMAKE_POST_LINK += \
+        cp vampy/COPYING out/vampy_COPYING.txt && \
+        cp vampy/README out/vampy_README.txt
+}
+
+SOURCES += \
+    vampy/PyPlugin.cpp \
+    vampy/PyPlugScanner.cpp \
+    vampy/vampy-main.cpp \
+    vampy/Mutex.cpp \
+    vampy/PyTypeInterface.cpp \
+    vampy/PyExtensionManager.cpp \
+    vampy/PyExtensionModule.cpp \
+    vampy/PyRealTime.cpp \
+    vampy/PyFeature.cpp \
+    vampy/PyParameterDescriptor.cpp \
+    vampy/PyOutputDescriptor.cpp \
+    vampy/PyFeatureSet.cpp \
+    vamp-plugin-sdk/src/vamp-sdk/FFT.cpp \
+    vamp-plugin-sdk/src/vamp-sdk/PluginAdapter.cpp \
+    vamp-plugin-sdk/src/vamp-sdk/RealTime.cpp