comparison vamp-client/client.cpp @ 88:bf2e6f939f9f

Rename, + adjust finish

 // Next level: Capnp RPC, but I want to get the first level to work
 // first, not least because the server already exists.
 
 namespace piper { //!!! probably something different
 
-class PiperClient : public PiperClientBase
+class PiperClient : public PiperClientStubRequirements
 {
     // unsigned to avoid undefined behaviour on possible wrap
     typedef uint32_t ReqId;
     
 public:

         }
     }
 
     //!!! obviously, factor out all repetitive guff
 
+    //!!! list and load are supposed to be called by application code,
+    //!!! but the rest are only supposed to be called by the plugin --
+    //!!! sort out the api here
+    
     Vamp::Plugin *
     load(std::string key, float inputSampleRate, int adapterFlags) {
 
         if (!m_process) {
             throw std::runtime_error("Piper server failed to start");

         //!!! (from another thread)
 
         QByteArray buffer = readResponseBuffer();
 	auto karr = toKJArray(buffer);
         capnp::FlatArrayMessageReader responseMessage(karr);
-	cerr << "made reader" << endl;
         RpcResponse::Reader reader = responseMessage.getRoot<RpcResponse>();
 
         //!!! handle (explicit) error case
 
         checkResponseType(reader, RpcResponse::Response::Which::LOAD, id);

         VampnProto::readFinishResponse(pr,
                                        reader.getResponse().getFinish(),
                                        m_mapper);
 
         m_mapper.removePlugin(m_mapper.pluginToHandle(plugin));
-        delete plugin;
+
+	// Don't delete the plugin. It's the plugin that is supposed
+	// to be calling us here
         
         return pr.features;
     }
 
 private:

     toKJArray(QByteArray qarr) {
 	// We could do this whole thing with fewer copies, but let's
 	// see whether it matters first
         size_t wordSize = sizeof(capnp::word);
 	size_t words = qarr.size() / wordSize;
-	cerr << "converting " << words << " words (" << (words * wordSize) << " bytes)" << endl;
 	kj::Array<capnp::word> karr(kj::heapArray<capnp::word>(words));
 	memcpy(karr.begin(), qarr.data(), words * wordSize);
 	return karr;
     }
 

             } else {
                 buffer.append(m_process->read(wordCount * wordSize));
                 size_t haveWords = buffer.size() / wordSize;
                 size_t expectedWords =
                     capnp::expectedSizeInWordsFromPrefix(toKJArray(buffer));
-
-                cerr << "haveWords = " << haveWords << ", expectedWords = " << expectedWords << endl;
-                
                 if (haveWords >= expectedWords) {
                     if (haveWords > expectedWords) {
                         cerr << "WARNING: obtained more data than expected ("
                              << haveWords << " words, expected " << expectedWords
                              << ")" << endl;

         auto fl(features[0]);
         for (const auto &f: fl) {
             cerr << f.values[0] << endl;
         }
     }
-    //!!! todo: make it possible to do both of the following --
+
     (void)plugin->getRemainingFeatures();
-//    delete plugin;
+    delete plugin;
     //!!! -- and also implement reset(), which will need to reconstruct internally
 }