Mercurial > hg > piper-cpp
changeset 53:9bebe2780cc0
Update adapter etc for feature set strings
| author | Chris Cannam <c.cannam@qmul.ac.uk> |
|---|---|
| date | Fri, 16 Sep 2016 16:28:47 +0100 |
| parents | e90fd30990eb |
| children | 524a6d5ee813 |
| files | utilities/vampipe-convert.cpp |
| diffstat | 1 files changed, 7 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- 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;