# HG changeset patch
# User Chris Cannam <c.cannam@qmul.ac.uk>
# Date 1474288926 -3600
# Node ID 13245b6ae809d5221da7a7810429a6522dcc21af
# Parent  3b7b709db48e3194f7f63d6b158a3dc6adb2895b
Update adapter code to new configuration+finish structures

diff -r 3b7b709db48e -r 13245b6ae809 VamPipePluginLibrary.cpp
--- a/VamPipePluginLibrary.cpp	Fri Sep 16 16:28:47 2016 +0100
+++ b/VamPipePluginLibrary.cpp	Mon Sep 19 13:42:06 2016 +0100
@@ -100,7 +100,7 @@
 	rr.processRequest = VampJson::toVampRequest_Process(j, m_mapper, serialisation);
 	break;
     case RRType::Finish:
-	rr.finishPlugin = VampJson::toVampRequest_Finish(j, m_mapper);
+	rr.finishRequest = VampJson::toVampRequest_Finish(j, m_mapper);
 	break;
     case RRType::NotValid:
 	break;
@@ -138,7 +138,8 @@
             j = VampJson::fromVampResponse_Load(rr.loadResponse, m_mapper);
             break;
         case RRType::Configure:
-            j = VampJson::fromVampResponse_Configure(rr.configurationResponse);
+            j = VampJson::fromVampResponse_Configure(rr.configurationResponse,
+                                                     m_mapper);
             break;
         case RRType::Process:
             j = VampJson::fromVampResponse_Process
@@ -314,9 +315,9 @@
 
 	case RRType::Finish:
 	{
-            response.finishResponse.plugin = request.finishPlugin;
+            response.finishResponse.plugin = request.finishRequest.plugin;
 	    response.finishResponse.features =
-		request.finishPlugin->getRemainingFeatures();
+		request.finishRequest.plugin->getRemainingFeatures();
 	    
             // We do not delete the plugin here -- we need it in the
             // mapper when converting the features. It gets deleted
@@ -333,9 +334,9 @@
 	string rstr = writeResponse(response);
 
         if (request.type == RRType::Finish) {
-            auto h = m_mapper.pluginToHandle(request.finishPlugin);
+            auto h = m_mapper.pluginToHandle(request.finishRequest.plugin);
             m_mapper.removePlugin(h);
-            delete request.finishPlugin;
+            delete request.finishRequest.plugin;
         }
 
         return rstr;