# HG changeset patch
# User Chris Cannam <c.cannam@qmul.ac.uk>
# Date 1474039727 -3600
# Node ID 9bebe2780cc0606a4cb0b66c7f05cbb28a9c626d
# Parent  e90fd30990eb5acab62882a3d12f8b5ce0950217
Update adapter etc for feature set strings

diff -r e90fd30990eb -r 9bebe2780cc0 utilities/vampipe-convert.cpp
--- a/utilities/vampipe-convert.cpp	Fri Sep 16 16:20:05 2016 +0100
+++ b/utilities/vampipe-convert.cpp	Fri Sep 16 16:28:47 2016 +0100
@@ -204,6 +204,11 @@
 {
     Json j;
 
+    VampJson::BufferSerialisation serialisation =
+        (m_useBase64 ?
+         VampJson::BufferSerialisation::Base64 :
+         VampJson::BufferSerialisation::Text);
+
     if (!rr.success) {
 
 	j = VampJson::fromError(rr.errorText, rr.type);
@@ -223,19 +228,11 @@
 	    break;
 	case RRType::Process:
 	    j = VampJson::fromVampResponse_Process
-		(rr.processResponse,
-		 mapper,
-		 useBase64 ?
-		 VampJson::BufferSerialisation::Base64 :
-		 VampJson::BufferSerialisation::Text);
+		(rr.processResponse, mapper, serialisation);
 	    break;
 	case RRType::Finish:
 	    j = VampJson::fromVampResponse_Finish
-		(rr.finishResponse,
-		 mapper,
-		 useBase64 ?
-		 VampJson::BufferSerialisation::Base64 :
-		 VampJson::BufferSerialisation::Text);
+		(rr.finishResponse, mapper, serialisation);
 	    break;
 	case RRType::NotValid:
 	    break;