Mercurial > hg > piper-vamp-js-builds

changeset 25:6bd90426715d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add Tuning Difference plugin
author Chris Cannam
date Mon, 17 Jul 2017 16:02:19 +0100
parents 1e6940e42972
children 3a6ebb47393f
files tuning-difference/Makefile tuning-difference/tuning-difference.cpp vext-lock.json vext-project.json
diffstat 4 files changed, 82 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tuning-difference/Makefile	Mon Jul 17 16:02:19 2017 +0100
@@ -0,0 +1,37 @@
+
+PIPER_VAMP_JS_DIR	:= ../ext/piper-vamp-js
+
+PLUGIN_DIR		:= ../ext/tuning-difference
+
+SRC_DIR			:= $(PLUGIN_DIR)/src
+CQ_DIR			:= $(PLUGIN_DIR)/constant-q-cpp
+CQS_DIR			:= $(CQ_DIR)/src
+
+MODULE_NAME		:= TuningDifference
+MODULE_SOURCE		:= tuning-difference.cpp
+
+PLUGIN_SOURCES	:= \
+	$(SRC_DIR)/TuningDifference.cpp \
+	$(CQS_DIR)/CQKernel.cpp \
+	$(CQS_DIR)/ConstantQ.cpp \
+	$(CQS_DIR)/CQSpectrogram.cpp \
+	$(CQS_DIR)/CQInverse.cpp \
+	$(CQS_DIR)/Chromagram.cpp \
+	$(CQS_DIR)/Pitch.cpp \
+	$(CQS_DIR)/dsp/FFT.cpp \
+	$(CQS_DIR)/dsp/KaiserWindow.cpp \
+	$(CQS_DIR)/dsp/MathUtilities.cpp \
+	$(CQS_DIR)/dsp/Resampler.cpp \
+	$(CQS_DIR)/dsp/SincWindow.cpp
+
+PLUGIN_C_SOURCES := \
+	$(CQS_DIR)/ext/kissfft/kiss_fft.c \
+	$(CQS_DIR)/ext/kissfft/tools/kiss_fftr.c
+
+EMFLAGS		:= -s TOTAL_MEMORY=134217728
+
+DEFINES		:= -Dkiss_fft_scalar=double
+
+INCLUDES	:= -I$(SRC_DIR) -I$(CQ_DIR) -I$(CQ_DIR)/cq -I$(CQS_DIR) -I$(CQS_DIR)/ext/kissfft -I$(CQS_DIR)/ext/kissfft/tools 
+
+include $(PIPER_VAMP_JS_DIR)/Makefile.inc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tuning-difference/tuning-difference.cpp	Mon Jul 17 16:02:19 2017 +0100
@@ -0,0 +1,38 @@
+
+#include "PiperExport.h"
+#include "TuningDifference.h"
+
+using piper_vamp_js::PiperAdapter;
+using piper_vamp_js::PiperPluginLibrary;
+
+static std::string libname("tuning-difference");
+
+static PiperAdapter<TuningDifference>
+tuningDifferenceAdapter(
+    libname,
+    { "Key and Tonality" },
+    {
+        { "cents",
+            { "" }
+        },
+        { "tuningfreq",
+            { "" }
+        },
+        { "reffeature",
+            { "" }
+        },
+        { "otherfeature",
+            { "" }
+        },
+        { "rotfeature",
+            { "" }
+        }
+    }
+    );
+
+static PiperPluginLibrary library({
+    &tuningDifferenceAdapter
+});
+
+PIPER_EXPORT_LIBRARY(library);
+
--- a/vext-lock.json	Wed Jun 28 13:27:12 2017 +0100
+++ b/vext-lock.json	Mon Jul 17 16:02:19 2017 +0100
@@ -41,6 +41,9 @@
     },
     "tipic": {
       "pin": "cbebb8a657ea"
+    },
+    "tuning-difference": {
+      "pin": "aaf8fa1cde19"
     }
   }
 }
--- a/vext-project.json	Wed Jun 28 13:27:12 2017 +0100
+++ b/vext-project.json	Mon Jul 17 16:02:19 2017 +0100
@@ -69,6 +69,10 @@
         "tipic": {
             "vcs": "hg",
             "service": "soundsoftware"
+        },
+        "tuning-difference": {
+            "vcs": "hg",
+            "service": "soundsoftware"
         }
     }
 }