comparison example.cpp @ 43:90bf9d9f9c95

Rearrange and rename VamPipe -> Piper as appropriate
author Chris Cannam
date Mon, 10 Oct 2016 17:05:37 +0100
parents a734a7e976fa
children b780e56eebb4
comparison
equal deleted inserted replaced
42:873ce3bfa776 43:90bf9d9f9c95
1 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */ 1 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
2 2
3 /* 3 /*
4 VamPipe 4 Piper
5 5
6 Centre for Digital Music, Queen Mary, University of London. 6 Centre for Digital Music, Queen Mary, University of London.
7 Copyright 2015-2016 QMUL. 7 Copyright 2015-2016 QMUL.
8 8
9 Permission is hereby granted, free of charge, to any person 9 Permission is hereby granted, free of charge, to any person
30 shall not be used in advertising or otherwise to promote the sale, 30 shall not be used in advertising or otherwise to promote the sale,
31 use or other dealings in this Software without prior written 31 use or other dealings in this Software without prior written
32 authorization. 32 authorization.
33 */ 33 */
34 34
35 #include "VamPipeAdapter.h" 35 #include "PiperAdapter.h"
36 #include "VamPipePluginLibrary.h" 36 #include "PiperPluginLibrary.h"
37 37
38 #include "vamp-plugin-sdk/examples/ZeroCrossing.h" 38 #include "examples/ZeroCrossing.h"
39 #include "vamp-plugin-sdk/examples/SpectralCentroid.h" 39 #include "examples/SpectralCentroid.h"
40 #include "vamp-plugin-sdk/examples/PercussionOnsetDetector.h" 40 #include "examples/PercussionOnsetDetector.h"
41 #include "vamp-plugin-sdk/examples/FixedTempoEstimator.h" 41 #include "examples/FixedTempoEstimator.h"
42 #include "vamp-plugin-sdk/examples/AmplitudeFollower.h" 42 #include "examples/AmplitudeFollower.h"
43 #include "vamp-plugin-sdk/examples/PowerSpectrum.h" 43 #include "examples/PowerSpectrum.h"
44 44
45 using vampipe::VamPipeAdapter; 45 using piper::PiperAdapter;
46 using vampipe::VamPipePluginLibrary; 46 using piper::PiperPluginLibrary;
47 47
48 static std::string soname("vamp-example-plugins"); 48 static std::string soname("vamp-example-plugins");
49 49
50 static VamPipeAdapter<ZeroCrossing> zeroCrossingAdapter(soname); 50 static PiperAdapter<ZeroCrossing> zeroCrossingAdapter(soname);
51 static VamPipeAdapter<SpectralCentroid> spectralCentroidAdapter(soname); 51 static PiperAdapter<SpectralCentroid> spectralCentroidAdapter(soname);
52 static VamPipeAdapter<PercussionOnsetDetector> percussionOnsetAdapter(soname); 52 static PiperAdapter<PercussionOnsetDetector> percussionOnsetAdapter(soname);
53 static VamPipeAdapter<FixedTempoEstimator> fixedTempoAdapter(soname); 53 static PiperAdapter<FixedTempoEstimator> fixedTempoAdapter(soname);
54 static VamPipeAdapter<AmplitudeFollower> amplitudeAdapter(soname); 54 static PiperAdapter<AmplitudeFollower> amplitudeAdapter(soname);
55 static VamPipeAdapter<PowerSpectrum> powerSpectrumAdapter(soname); 55 static PiperAdapter<PowerSpectrum> powerSpectrumAdapter(soname);
56 56
57 static VamPipePluginLibrary library({ 57 static PiperPluginLibrary library({
58 &zeroCrossingAdapter, 58 &zeroCrossingAdapter,
59 &spectralCentroidAdapter, 59 &spectralCentroidAdapter,
60 &percussionOnsetAdapter, 60 &percussionOnsetAdapter,
61 &fixedTempoAdapter, 61 &fixedTempoAdapter,
62 &amplitudeAdapter, 62 &amplitudeAdapter,
63 &powerSpectrumAdapter 63 &powerSpectrumAdapter
64 }); 64 });
65 65
66 extern "C" { 66 extern "C" {
67 67
68 const char *vampipeRequestJson(const char *request) { 68 const char *piperRequestJson(const char *request) {
69 return library.requestJson(request); 69 return library.requestJson(request);
70 } 70 }
71 71
72 const char *vampipeProcessRaw(int handle, 72 const char *piperProcessRaw(int handle,
73 const float *const *inputBuffers, 73 const float *const *inputBuffers,
74 int sec, 74 int sec,
75 int nsec) { 75 int nsec) {
76 return library.processRaw(handle, inputBuffers, sec, nsec); 76 return library.processRaw(handle, inputBuffers, sec, nsec);
77 } 77 }
78 78
79 void vampipeFreeJson(const char *json) { 79 void piperFreeJson(const char *json) {
80 return library.freeJson(json); 80 return library.freeJson(json);
81 } 81 }
82 82
83 } 83 }
84 84