Mercurial > hg > piper-cpp

changeset 275:292ec9b50280

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Tidy
author Chris Cannam <cannam@all-day-breakfast.com>
date Wed, 17 Oct 2018 15:43:00 +0100
parents 532a146b5229
children 8c8b5fe47b33
files vamp-capnp/VampnProto.h vamp-json/VampJson.h
diffstat 2 files changed, 16 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/vamp-capnp/VampnProto.h	Wed Oct 17 15:22:29 2018 +0100
+++ b/vamp-capnp/VampnProto.h	Wed Oct 17 15:43:00 2018 +0100
@@ -643,7 +643,8 @@
                      const piper::LoadResponse::Reader &r,
                      const PluginHandleMapper &pmapper) {
 
-        resp.plugin = pmapper.handleToPlugin(r.getHandle());
+        auto h = r.getHandle();
+        resp.plugin = pmapper.handleToPlugin(h);
         readExtractorStaticData(resp.staticData, r.getStaticData());
         readConfiguration(resp.defaultConfiguration,
                           r.getDefaultConfiguration());
@@ -700,7 +701,8 @@
                               const piper::ConfigurationResponse::Reader &r,
                               const PluginHandleMapper &pmapper) {
 
-        cr.plugin = pmapper.handleToPlugin(r.getHandle());
+        auto h = r.getHandle();
+        cr.plugin = pmapper.handleToPlugin(h);
         cr.outputs.clear();
         cr.staticOutputInfo.clear();
         auto oo = r.getOutputs();
@@ -1085,8 +1087,8 @@
         if (getRequestResponseType(r) != RRType::Finish) {
             throw std::logic_error("not a finish request");
         }
-        req.plugin = pmapper.handleToPlugin
-            (r.getRequest().getFinish().getHandle());
+        auto h = r.getRequest().getFinish().getHandle();
+        req.plugin = pmapper.handleToPlugin(h);
     }
 
     static void
--- a/vamp-json/VampJson.h	Wed Oct 17 15:22:29 2018 +0100
+++ b/vamp-json/VampJson.h	Wed Oct 17 15:43:00 2018 +0100
@@ -982,7 +982,8 @@
         }
 
         LoadResponse resp;
-        resp.plugin = pmapper.handleToPlugin(j["handle"].int_value());
+        auto h = j["handle"].int_value();
+        resp.plugin = pmapper.handleToPlugin(h);
         resp.staticData = toPluginStaticData(j["staticData"], err);
         if (failed(err)) return {};
         resp.defaultConfiguration = toPluginConfiguration(j["defaultConfiguration"],
@@ -1015,7 +1016,8 @@
         }
 
         ConfigurationRequest cr;
-        cr.plugin = pmapper.handleToPlugin(j["handle"].int_value());
+        auto h = j["handle"].int_value();
+        cr.plugin = pmapper.handleToPlugin(h);
         cr.configuration = toPluginConfiguration(j["configuration"], err);
         if (failed(err)) return {};
         return cr;
@@ -1066,7 +1068,8 @@
             return {};
         }
         
-        cr.plugin = pmapper.handleToPlugin(j["handle"].int_value());
+        auto h = j["handle"].int_value();
+        cr.plugin = pmapper.handleToPlugin(h);
 
         for (const auto &o: j["outputList"].array_items()) {
             auto odpair = toOutputDescriptor(o, err);
@@ -1130,7 +1133,8 @@
         }
 
         ProcessRequest r;
-        r.plugin = pmapper.handleToPlugin(j["handle"].int_value());
+        auto h = j["handle"].int_value();
+        r.plugin = pmapper.handleToPlugin(h);
 
         r.timestamp = toRealTime(input["timestamp"], err);
         if (failed(err)) return {};
@@ -1545,8 +1549,8 @@
         checkRpcRequestType(j, "finish", err);
         if (failed(err)) return {};
         FinishRequest req;
-        req.plugin = pmapper.handleToPlugin
-            (j["params"]["handle"].int_value());
+        auto h = j["params"]["handle"].int_value();
+        req.plugin = pmapper.handleToPlugin(h);
         return req;
     }