Mercurial > hg > piper-vamp-js

changeset 115:6db821ba39ab

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update to match current namespaces etc in piper-cpp
author Chris Cannam <c.cannam@qmul.ac.uk>
date Thu, 13 Oct 2016 18:13:55 +0100
parents c14520102b46
children 286c8e57abd0
files PiperAdapter.h PiperPluginLibrary.cpp PiperPluginLibrary.h example.cpp
diffstat 4 files changed, 36 insertions(+), 38 deletions(-) [+]
line wrap: on
line diff
--- a/PiperAdapter.h	Thu Oct 13 14:37:15 2016 +0100
+++ b/PiperAdapter.h	Thu Oct 13 18:13:55 2016 +0100
@@ -35,21 +35,21 @@
 #ifndef PIPER_ADAPTER_H
 #define PIPER_ADAPTER_H
 
-#include <vamp-hostsdk/PluginStaticData.h>
-#include <vamp-hostsdk/PluginConfiguration.h>
-#include <vamp-hostsdk/RequestResponse.h>
+#include "vamp-support/PluginStaticData.h"
+#include "vamp-support/PluginConfiguration.h"
+#include "vamp-support/RequestResponse.h"
 
 #include <vamp-hostsdk/PluginInputDomainAdapter.h>
 #include <vamp-hostsdk/PluginBufferingAdapter.h>
 #include <vamp-hostsdk/PluginChannelAdapter.h>
 
-namespace piper {
+namespace piper_vamp_js { //!!! not a good name for this namespace
 
 class PiperAdapterInterface
 {
 public:
-    virtual Vamp::HostExt::PluginStaticData getStaticData() const = 0;
-    virtual Vamp::HostExt::LoadResponse loadPlugin(Vamp::HostExt::LoadRequest r) const = 0;
+    virtual piper_vamp::PluginStaticData getStaticData() const = 0;
+    virtual piper_vamp::LoadResponse loadPlugin(piper_vamp::LoadRequest r) const = 0;
     virtual Vamp::Plugin *createPlugin(float inputSampleRate) const = 0;
 };
 
@@ -66,9 +66,9 @@
 public:
     virtual Vamp::Plugin *createPlugin(float inputSampleRate) const = 0;
     
-    virtual Vamp::HostExt::PluginStaticData getStaticData() const {
+    virtual piper_vamp::PluginStaticData getStaticData() const {
         Vamp::Plugin *p = createPlugin(44100.f);
-	auto data = Vamp::HostExt::PluginStaticData::fromPlugin
+	auto data = piper_vamp::PluginStaticData::fromPlugin
 	    (m_soname + ":" + p->getIdentifier(),
 	     {}, //!!! todo: category - tricky one that
 	     p);
@@ -76,8 +76,7 @@
         return data;
     }
 
-    virtual Vamp::HostExt::LoadResponse loadPlugin(Vamp::HostExt::
-						   LoadRequest r) const {
+    virtual piper_vamp::LoadResponse loadPlugin(piper_vamp::LoadRequest r) const {
 	
 	// We assume the caller has guaranteed that the request is for
 	// the correct plugin (so we don't have to check the plugin
@@ -99,10 +98,10 @@
 	    p = new Vamp::HostExt::PluginChannelAdapter(p);
 	}
 
-	Vamp::HostExt::LoadResponse response;
+	piper_vamp::LoadResponse response;
 	response.plugin = p;
 
-	response.staticData = Vamp::HostExt::PluginStaticData::fromPlugin
+	response.staticData = piper_vamp::PluginStaticData::fromPlugin
 	    (m_soname + ":" + p->getIdentifier(),
 	     {}, //!!! todo: category - tricky one that
 	     p);
@@ -112,7 +111,7 @@
 	    defaultChannels = p->getMinChannelCount();
 	}
     
-	response.defaultConfiguration = Vamp::HostExt::PluginConfiguration::fromPlugin
+	response.defaultConfiguration = piper_vamp::PluginConfiguration::fromPlugin
 	    (p,
 	     defaultChannels,
 	     p->getPreferredStepSize(),
--- a/PiperPluginLibrary.cpp	Thu Oct 13 14:37:15 2016 +0100
+++ b/PiperPluginLibrary.cpp	Thu Oct 13 18:13:55 2016 +0100
@@ -39,8 +39,9 @@
 
 using namespace std;
 using namespace json11;
+using namespace piper_vamp;
 
-namespace piper {
+namespace piper_vamp_js { //!!! not good
 
 //!!! too many explicit namespaces here
 
@@ -68,18 +69,18 @@
     }
 }
 
-Vamp::HostExt::ListResponse
+ListResponse
 PiperPluginLibrary::listPluginData() const
 {
-    Vamp::HostExt::ListResponse resp;
+    ListResponse resp;
     for (auto a: m_adapters) {
 	resp.available.push_back(a.second->getStaticData());
     }
     return resp;
 }
 
-Vamp::HostExt::LoadResponse
-PiperPluginLibrary::loadPlugin(Vamp::HostExt::LoadRequest req, string &err) const
+LoadResponse
+PiperPluginLibrary::loadPlugin(LoadRequest req, string &err) const
 {
     string key = req.pluginKey;
     if (m_adapters.find(key) != m_adapters.end()) {
@@ -97,11 +98,11 @@
     }
 }
 
-Vamp::HostExt::ConfigurationResponse
-PiperPluginLibrary::configurePlugin(Vamp::HostExt::ConfigurationRequest req,
+ConfigurationResponse
+PiperPluginLibrary::configurePlugin(ConfigurationRequest req,
                                       string &err) const
 {
-    for (Vamp::HostExt::PluginConfiguration::ParameterMap::const_iterator i =
+    for (PluginConfiguration::ParameterMap::const_iterator i =
              req.configuration.parameterValues.begin();
          i != req.configuration.parameterValues.end(); ++i) {
         req.plugin->setParameter(i->first, i->second);
@@ -111,7 +112,7 @@
         req.plugin->selectProgram(req.configuration.currentProgram);
     }
 
-    Vamp::HostExt::ConfigurationResponse response;
+    ConfigurationResponse response;
 
     response.plugin = req.plugin;
 
@@ -147,7 +148,7 @@
 
     Vamp::RealTime timestamp(sec, nsec);
 
-    Vamp::HostExt::ProcessResponse resp;
+    ProcessResponse resp;
     resp.plugin = plugin;
     resp.features = plugin->process(inputBuffers, timestamp);
     
@@ -271,7 +272,7 @@
                 }
 
                 if (fbuffers) {
-                    Vamp::HostExt::ProcessResponse resp;
+                    ProcessResponse resp;
                     resp.plugin = req.plugin;
                     resp.features = req.plugin->process(fbuffers, req.timestamp);
                     delete[] fbuffers;
@@ -294,7 +295,7 @@
                 rj = VampJson::fromError("unknown or invalid plugin handle", type, id);
             } else {
 
-                Vamp::HostExt::ProcessResponse resp;
+                FinishResponse resp;
                 resp.plugin = req.plugin;
 
                 // Finish can be called (to unload the plugin) even if
--- a/PiperPluginLibrary.h	Thu Oct 13 14:37:15 2016 +0100
+++ b/PiperPluginLibrary.h	Thu Oct 13 18:13:55 2016 +0100
@@ -36,15 +36,14 @@
 #define PIPER_PLUGIN_LIBRARY_H
 
 #include "vamp-support/CountingPluginHandleMapper.h"
-
-#include <vamp-hostsdk/PluginStaticData.h>
-#include <vamp-hostsdk/RequestResponse.h>
+#include "vamp-support/PluginStaticData.h"
+#include "vamp-support/RequestResponse.h"
 
 #include <vector>
 #include <string>
 #include <cstring>
 
-namespace piper {
+namespace piper_vamp_js {
 
 class PiperAdapterInterface;
 
@@ -70,17 +69,16 @@
     std::string requestJsonImpl(std::string req);
     std::string processRawImpl(int, const float *const *, int, int);
 
-    Vamp::HostExt::ListResponse listPluginData() const;
-    Vamp::HostExt::LoadResponse loadPlugin(Vamp::HostExt::LoadRequest r,
-                                           std::string &err) const;
-    Vamp::HostExt::ConfigurationResponse configurePlugin(Vamp::HostExt::
-							 ConfigurationRequest r,
-                                                         std::string &err)
+    piper_vamp::ListResponse listPluginData() const;
+    piper_vamp::LoadResponse loadPlugin(piper_vamp::LoadRequest r,
+                                        std::string &err) const;
+    piper_vamp::ConfigurationResponse configurePlugin(piper_vamp::ConfigurationRequest r,
+                                                      std::string &err)
         const;
 
     // map from pluginKey -> adapter
     std::map<std::string, PiperAdapterInterface *> m_adapters;
-    CountingPluginHandleMapper m_mapper;
+    piper_vamp::CountingPluginHandleMapper m_mapper;
     bool m_useBase64;
 };
 
--- a/example.cpp	Thu Oct 13 14:37:15 2016 +0100
+++ b/example.cpp	Thu Oct 13 18:13:55 2016 +0100
@@ -42,8 +42,8 @@
 #include "examples/AmplitudeFollower.h"
 #include "examples/PowerSpectrum.h"
 
-using piper::PiperAdapter;
-using piper::PiperPluginLibrary;
+using piper_vamp_js::PiperAdapter;
+using piper_vamp_js::PiperPluginLibrary;
 
 static std::string soname("vamp-example-plugins");