diff qm-vamp-plugins/qm-vamp-plugins.cpp @ 39:4b7e9d3a2528

Tidy

--- a/qm-vamp-plugins/qm-vamp-plugins.cpp	Fri Nov 11 17:12:31 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);
-}
-
-}
-