Mercurial > hg > piper-cpp
changeset 205:587e9691a44e
Merge pull request #4 from piper-audio/test/plugin-stub-configured-framing
Test/plugin stub configured framing
author | Chris Cannam <cannam@all-day-breakfast.com> |
---|---|
date | Thu, 09 Feb 2017 12:54:00 +0000 |
parents | fbc61cf65c64 (diff) c9471a9f4b71 (current diff) |
children | f7045f7995bc 61034472c304 ac4f5f8ee0e7 |
files | |
diffstat | 2 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/README.md Thu Feb 09 12:06:43 2017 +0000 +++ b/README.md Thu Feb 09 12:54:00 2017 +0000 @@ -34,8 +34,8 @@ ## Authors and licensing -Written by Chris Cannam at the Centre for Digital Music, Queen Mary, -University of London. +Written by Chris Cannam and Lucas Thompson at the Centre for Digital +Music, Queen Mary, University of London. Copyright (c) 2015-2017 Queen Mary, University of London, provided under a BSD-style licence. See the file COPYING for details.
--- a/vamp-json/VampJson.h Thu Feb 09 12:06:43 2017 +0000 +++ b/vamp-json/VampJson.h Thu Feb 09 12:54:00 2017 +0000 @@ -479,11 +479,11 @@ Vamp::Plugin::FeatureList fl; if (!j.is_array()) { err = "array expected for feature list"; - return {}; + return fl; } for (const json11::Json &fj : j.array_items()) { fl.push_back(toFeature(fj, serialisation, err)); - if (failed(err)) return {}; + if (failed(err)) return fl; } return fl; } @@ -497,16 +497,16 @@ Vamp::Plugin::FeatureSet fs; if (!j.is_object()) { err = "object expected for feature set"; - return {}; + return fs; } for (auto &entry : j.object_items()) { int n = omapper.idToIndex(entry.first); if (fs.find(n) != fs.end()) { err = "duplicate numerical index for output"; - return {}; + return fs; } fs[n] = toFeatureList(entry.second, serialisation, err); - if (failed(err)) return {}; + if (failed(err)) return fs; } return fs; }