Mercurial > hg > piper-vamp-js-builds

changeset 12:7390bd3a0e56

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Tidy
author Chris Cannam
date Fri, 11 Nov 2016 17:25:35 +0000
parents ab7c3399f5fc (diff) ef46c7108362 (current diff)
children d81d02140d43
files nnls-chroma/Makefile pyin/Makefile qm-vamp-plugins/qm-vamp-plugins.cpp silvet/Makefile silvet/silvet.cpp
diffstat 6 files changed, 62 insertions(+), 136 deletions(-) [+]
line wrap: on
line diff
--- a/match-vamp-plugin/Makefile	Fri Nov 11 17:11:53 2016 +0000
+++ b/match-vamp-plugin/Makefile	Fri Nov 11 17:25:35 2016 +0000
@@ -1,17 +1,14 @@
 
 PIPER_VAMP_JS_DIR	:= ../../piper-vamp-js
-MATCH_VAMP_DIR		:= ../../match-vamp
+PLUGIN_SRC_DIR		:= ../../match-vamp/src
 
-MODULE_NAME	:= MatchVampPlugin
+MODULE_NAME		:= MatchVampPlugin
+MODULE_SOURCE		:= match-vamp-plugin.cpp
 
-SRC_DIR		:= $(MATCH_VAMP_DIR)/src
+PLUGIN_SOURCES	:= $(wildcard $(PLUGIN_SRC_DIR)/*.cpp)
 
-PLUGIN_SOURCES	:= $(wildcard $(SRC_DIR)/*.cpp)
-
-INCLUDES	:= -I$(SRC_DIR)
+INCLUDES	:= -I$(PLUGIN_SRC_DIR)
 DEFINES		:= -DUSE_COMPACT_TYPES
 EMFLAGS		:= -s TOTAL_MEMORY=100000000
 
-MODULE_SOURCE	:= match-vamp-plugin.cpp
-
 include $(PIPER_VAMP_JS_DIR)/Makefile.inc
--- a/nnls-chroma/Makefile	Fri Nov 11 17:11:53 2016 +0000
+++ b/nnls-chroma/Makefile	Fri Nov 11 17:25:35 2016 +0000
@@ -2,25 +2,27 @@
 PIPER_VAMP_JS_DIR	:= ../../piper-vamp-js
 PLUGIN_SRC_DIR		:= ../../nnls-chroma
 
-MODULE_NAME	:= NNLSChroma
+MODULE_NAME		:= NNLSChroma
+MODULE_SOURCE		:= nnls-chroma.cpp
 
 SOURCE_FILES	:= \
-	chromamethods.cpp \
-	NNLSBase.cpp \
-	NNLSChroma.cpp \
-	Chordino.cpp \
-	Tuning.cpp \
-	viterbi.cpp
+		chromamethods.cpp \
+		NNLSBase.cpp \
+		NNLSChroma.cpp \
+		Chordino.cpp \
+		Tuning.cpp \
+		viterbi.cpp
 
 C_SOURCE_FILES	:= \
-	nnls.c
+		nnls.c
 
-PLUGIN_SOURCES	:= $(addprefix $(PLUGIN_SRC_DIR)/,$(SOURCE_FILES))
-PLUGIN_C_SOURCES := $(addprefix $(PLUGIN_SRC_DIR)/,$(C_SOURCE_FILES))
+PLUGIN_SOURCES		:= $(addprefix $(PLUGIN_SRC_DIR)/,$(SOURCE_FILES))
+PLUGIN_C_SOURCES 	:= $(addprefix $(PLUGIN_SRC_DIR)/,$(C_SOURCE_FILES))
 
-INCLUDES	:= -I$(PLUGIN_SRC_DIR) -I../../DEPENDENCIES/generic/include -I../../vamp-build-and-test/DEPENDENCIES/generic/include
-
-MODULE_SOURCE	:= nnls-chroma.cpp
+INCLUDES	:= \
+		-I$(PLUGIN_SRC_DIR) \
+		-I../../DEPENDENCIES/generic/include \
+		-I../../vamp-build-and-test/DEPENDENCIES/generic/include
 
 EMFLAGS		:= -s TOTAL_MEMORY=100000000 -s NO_FILESYSTEM=0
 
--- a/pyin/Makefile	Fri Nov 11 17:11:53 2016 +0000
+++ b/pyin/Makefile	Fri Nov 11 17:25:35 2016 +0000
@@ -2,26 +2,28 @@
 PIPER_VAMP_JS_DIR	:= ../../piper-vamp-js
 PLUGIN_SRC_DIR		:= ../../pyin
 
-MODULE_NAME	:= PYin
+MODULE_NAME		:= PYin
+MODULE_SOURCE		:= pyin.cpp
 
-SOURCE_FILES := \
-	PYinVamp.cpp \
-	YinVamp.cpp \
-	LocalCandidatePYIN.cpp \
-	Yin.cpp \
-	YinUtil.cpp \
-	MonoNote.cpp \
-	MonoPitch.cpp \
-	MonoNoteParameters.cpp \
-	SparseHMM.cpp \
-	MonoNoteHMM.cpp \
-	MonoPitchHMM.cpp
+SOURCE_FILES	:= \
+		PYinVamp.cpp \
+		YinVamp.cpp \
+		LocalCandidatePYIN.cpp \
+		Yin.cpp \
+		YinUtil.cpp \
+		MonoNote.cpp \
+		MonoPitch.cpp \
+		MonoNoteParameters.cpp \
+		SparseHMM.cpp \
+		MonoNoteHMM.cpp \
+		MonoPitchHMM.cpp
 
 PLUGIN_SOURCES	:= $(addprefix $(PLUGIN_SRC_DIR)/,$(SOURCE_FILES))
 
-INCLUDES	:= -I$(PLUGIN_SRC_DIR) -I../../DEPENDENCIES/generic/include -I../../vamp-build-and-test/DEPENDENCIES/generic/include
-
-MODULE_SOURCE	:= pyin.cpp
+INCLUDES	:= \
+		-I$(PLUGIN_SRC_DIR) \
+		-I../../DEPENDENCIES/generic/include \
+		-I../../vamp-build-and-test/DEPENDENCIES/generic/include
 
 EMFLAGS		:= -s TOTAL_MEMORY=100000000
 
--- a/qm-vamp-plugins/qm-vamp-plugins.cpp	Fri Nov 11 17:11:53 2016 +0000
+++ b/qm-vamp-plugins/qm-vamp-plugins.cpp	Fri Nov 11 17:25:35 2016 +0000
@@ -1,39 +1,6 @@
 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
 
-/*
-    Piper
-
-    Centre for Digital Music, Queen Mary, University of London.
-    Copyright 2015-2016 QMUL.
-  
-    Permission is hereby granted, free of charge, to any person
-    obtaining a copy of this software and associated documentation
-    files (the "Software"), to deal in the Software without
-    restriction, including without limitation the rights to use, copy,
-    modify, merge, publish, distribute, sublicense, and/or sell copies
-    of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be
-    included in all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
-    ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
-    CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-    Except as contained in this notice, the names of the Centre for
-    Digital Music; Queen Mary, University of London; and Chris Cannam
-    shall not be used in advertising or otherwise to promote the sale,
-    use or other dealings in this Software without prior written
-    authorization.
-*/
-
-#include "PiperAdapter.h"
-#include "PiperPluginLibrary.h"
+#include "PiperExport.h"
 
 #include "plugins/BeatTrack.h"
 #include "plugins/OnsetDetect.h"
@@ -69,37 +36,20 @@
 static PiperAdapter<Transcription> transcriptionAdapter(soname);
 
 static PiperPluginLibrary library({
-	&beatTrackerAdapter,
-	    &onsetDetectorAdapter,
-	    &chromagramPluginAdapter,
-	    &constantQAdapter,
-	    &tonalChangeDetectorAdapter,
-	    &keyDetectorAdapter,
-	    &mfccPluginAdapter,
-	    &segmenterPluginAdapter,
-	    &similarityPluginAdapter,
-	    &barBeatTrackPluginAdapter,
-//!!!	    &adaptiveSpectrogramAdapter,
-	    &dwtAdapter,
-	    &transcriptionAdapter
-	    });
+    &beatTrackerAdapter,
+    &onsetDetectorAdapter,
+    &chromagramPluginAdapter,
+    &constantQAdapter,
+    &tonalChangeDetectorAdapter,
+    &keyDetectorAdapter,
+    &mfccPluginAdapter,
+    &segmenterPluginAdapter,
+    &similarityPluginAdapter,
+    &barBeatTrackPluginAdapter,
+//!!!       &adaptiveSpectrogramAdapter,
+    &dwtAdapter,
+    &transcriptionAdapter
+});
 
-extern "C" {
+PIPER_EXPORT_LIBRARY(library);
 
-const char *piperRequestJson(const char *request) {
-    return library.requestJson(request);
-}
-
-const char *piperProcessRaw(int handle,
-                              const float *const *inputBuffers,
-                              int sec,
-                              int nsec) {
-    return library.processRaw(handle, inputBuffers, sec, nsec);
-}
-    
-void piperFreeJson(const char *json) {
-    return library.freeJson(json);
-}
-
-}
-
--- a/silvet/Makefile	Fri Nov 11 17:11:53 2016 +0000
+++ b/silvet/Makefile	Fri Nov 11 17:25:35 2016 +0000
@@ -2,7 +2,8 @@
 PIPER_VAMP_JS_DIR	:= ../../piper-vamp-js
 SILVET_DIR		:= ../../silvet
 
-MODULE_NAME	:= Silvet
+MODULE_NAME		:= Silvet
+MODULE_SOURCE		:= silvet.cpp
 
 SRC_DIR		:= $(SILVET_DIR)/src
 CQ_DIR	     	:= $(SILVET_DIR)/constant-q-cpp
@@ -13,7 +14,7 @@
 
 INCLUDES	:= -I$(SRC_DIR) -I$(CQ_DIR) -I$(CQ_DIR)/cq -I$(KFFT_DIR) -I$(KFFT_DIR)/tools -I$(SILVET_DIR) -I$(FD_DIR) -I$(BQVEC_DIR)
 
-EMFLAGS		:= -s TOTAL_MEMORY=100000000
+EMFLAGS		:= -s TOTAL_MEMORY=100000000 -s NO_FILESYSTEM=0
 
 DEFINES		:= -Dkiss_fft_scalar=double
 
@@ -50,6 +51,4 @@
 
 PLUGIN_C_SOURCES   := $(KFFT_SOURCES)
 
-MODULE_SOURCE	:= silvet.cpp
-
 include $(PIPER_VAMP_JS_DIR)/Makefile.inc
--- a/silvet/silvet.cpp	Fri Nov 11 17:11:53 2016 +0000
+++ b/silvet/silvet.cpp	Fri Nov 11 17:25:35 2016 +0000
@@ -1,36 +1,12 @@
+/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
 
-#include "PiperAdapter.h"
-#include "PiperPluginLibrary.h"
-
+#include "PiperExport.h"
 #include "Silvet.h"
 
-using piper_vamp_js::PiperAdapter;
-using piper_vamp_js::PiperPluginLibrary;
-
 static std::string soname("silvet");
 
-static PiperAdapter<Silvet> silvetAdapter(soname);
+static piper_vamp_js::PiperAdapter<Silvet> silvetAdapter(soname);
+static piper_vamp_js::PiperPluginLibrary library({ &silvetAdapter });
 
-static PiperPluginLibrary library({
-    &silvetAdapter
-});
+PIPER_EXPORT_LIBRARY(library);
 
-extern "C" {
-
-const char *piperRequestJson(const char *request) {
-    return library.requestJson(request);
-}
-
-const char *piperProcessRaw(int handle,
-                              const float *const *inputBuffers,
-                              int sec,
-                              int nsec) {
-    return library.processRaw(handle, inputBuffers, sec, nsec);
-}
-    
-void piperFreeJson(const char *json) {
-    return library.freeJson(json);
-}
-
-}
-