diff --git a/CMakeLists.txt b/CMakeLists.txt index 2fa929f6..3e37c21f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_policy(SET CMP0017 NEW) # need include() with .cmake project(PIP) set(PIP_MAJOR 3) set(PIP_MINOR 10) -set(PIP_REVISION 2) +set(PIP_REVISION 3) set(PIP_SUFFIX ) set(PIP_COMPANY SHS) set(PIP_DOMAIN org.SHS) diff --git a/libs/main/serialization/pivaluetree_conversions.cpp b/libs/main/serialization/pivaluetree_conversions.cpp index 429eeb61..cc61c669 100644 --- a/libs/main/serialization/pivaluetree_conversions.cpp +++ b/libs/main/serialization/pivaluetree_conversions.cpp @@ -252,6 +252,7 @@ PIJSON toJSONTree(const PIValueTree & root, PIValueTreeConversions::Options opti PIJSON PIValueTreeConversions::toJSON(const PIValueTree & root, Options options) { + if (options[IncludeRoot]) return toJSONTree(root, options); PIJSON ret = PIJSON::newArray(); for (const auto & c: root.children()) ret << toJSONTree(c, options); diff --git a/libs/main/serialization/pivaluetree_conversions.h b/libs/main/serialization/pivaluetree_conversions.h index 6b24ceea..f4f1aab6 100644 --- a/libs/main/serialization/pivaluetree_conversions.h +++ b/libs/main/serialization/pivaluetree_conversions.h @@ -38,7 +38,8 @@ enum Option { WithAttributes = 0x1, WithComment = 0x2, WithType = 0x4, - WithAll = 0xFFFFFF, + WithAll = 0xFFF, + IncludeRoot = 0x1000, Default = WithAll }; typedef PIFlags