Update opendspx using stdc::JsonValue

Author: CrSjimo

scripts/vcpkg

@@ -28,7 +28,6 @@
             "platform": "linux"
         },
         "wolf-midi",
-        "nlohmann-json",
         "zstd",
         "opendspx",
         {

scripts/vcpkg-manifest/vcpkg.json

@@ -8,7 +8,6 @@ qm_find_qt(LinguistTools)
 set(CURRENT_PLUGIN_DESC "${APPLICATION_NAME} Application Plugin")
 
 find_package(ExtensionSystem CONFIG REQUIRED)
-find_package(nlohmann_json CONFIG REQUIRED)
 find_package(opendspx CONFIG REQUIRED)
 
 function(diffscope_add_builtin_plugin _target)

src/libs/3rdparty/choruskit

@@ -13,8 +13,8 @@
 
 #include <opendspx/anchornode.h>
 #include <opendspx/vibrato.h>
-#include <opendspxinterpolator/parameterinterpolator.h>
-#include <opendspxinterpolator/vibratocurve.h>
+#include <opendspx/interpolator/parameterinterpolator.h>
+#include <opendspx/interpolator/vibratocurve.h>
 
 namespace Audio::Internal {
 

src/libs/3rdparty/dspxmodel

@@ -38,6 +38,8 @@
 
 #include <extensionsystem/pluginmanager.h>
 
+#include <stdcorelib/support/json.h>
+
 #include <opendspx/model.h>
 
 #include <SVSCraftCore/SVSCraftNamespace.h>
@@ -348,14 +350,14 @@ namespace Core {
                     }
                 },
                 .workspace = {
-                    {"diffscope", nlohmann::json::object({
-                        {"keySignatures", nlohmann::json::array({
-                            nlohmann::json::object({
+                    {"diffscope", stdc::JsonObject({
+                        {"keySignatures", stdc::JsonArray({
+                            stdc::JsonValue(stdc::JsonObject({
                                 {"pos", 0},
                                 {"mode", 2741},
                                 {"tonality", 0},
                                 {"accidentalType", 1}
-                            })
+                            }))
                         })}
                     })}
                 }

src/plugins/CMakeLists.txt

@@ -6,7 +6,7 @@
 
 #include <algorithm>
 
-#include <nlohmann/json.hpp>
+#include <stdcorelib/support/json.h>
 
 #include <QJsonArray>
 #include <QJsonObject>
@@ -16,7 +16,7 @@ namespace Core::Internal {
 
     class JsonUtils {
     public:
-        static nlohmann::json fromQJsonValue(const QJsonValue &value) {
+        static stdc::JsonValue fromQJsonValue(const QJsonValue &value) {
             if (value.isString())
                 return value.toString().toStdString();
 
@@ -27,13 +27,13 @@ namespace Core::Internal {
                 return value.toDouble();
 
             if (value.isArray()) {
-                nlohmann::json ret = nlohmann::json::array();
+                stdc::JsonArray ret;
                 std::ranges::transform(value.toArray(), std::back_inserter(ret), &JsonUtils::fromQJsonValue);
                 return ret;
             }
 
             if (value.isObject()) {
-                nlohmann::json ret = nlohmann::json::object();
+                stdc::JsonObject ret;
                 for (auto [key, item] : value.toObject().asKeyValueRange()) {
                     ret[key.toString().toStdString()] = fromQJsonValue(item);
                 }
@@ -43,26 +43,26 @@ namespace Core::Internal {
             return {};
         }
 
-        static QJsonValue toQJsonValue(const nlohmann::json &value) {
-            if (value.is_string())
-                return QString::fromStdString(value.get<std::string>());
+        static QJsonValue toQJsonValue(const stdc::JsonValue &value) {
+            if (value.isString())
+                return QString::fromStdString(value.toString());
 
-            if (value.is_boolean())
-                return value.get<bool>();
+            if (value.isBool())
+                return value.toBool();
 
-            if (value.is_number())
-                return value.get<double>();
+            if (value.isNumber())
+                return value.toDouble();
 
-            if (value.is_array()) {
+            if (value.isArray()) {
                 QJsonArray ret;
-                std::ranges::transform(value, std::back_inserter(ret), &JsonUtils::toQJsonValue);
+                std::ranges::transform(value.toArray(), std::back_inserter(ret), &JsonUtils::toQJsonValue);
                 return ret;
             }
 
-            if (value.is_object()) {
+            if (value.isObject()) {
                 QJsonObject ret;
-                for (auto it = value.begin(); it != value.end(); ++it) {
-                    ret[it.key().c_str()] = toQJsonValue(it.value());
+                for (const auto &[key, item] : value.toObject()) {
+                    ret[QString::fromStdString(key)] = toQJsonValue(item);
                 }
                 return ret;
             }

src/plugins/audio/internal/waveformsinger/WaveformSingerModel.h

@@ -7,8 +7,8 @@
 #include <QJsonObject>
 #include <QJsonArray>
 
-#include <opendspxserializer/serializer.h>
-#include <opendspxserializer/jsonconverterv1.h>
+#include <opendspx/serializer/serializer.h>
+#include <opendspx/serializer/jsonconverterv1.h>
 
 #include <coreplugin/internal/jsonutils.h>
 

src/plugins/coreplugin/core/CoreInterface.cpp

@@ -8,6 +8,8 @@
 
 #include <QList>
 
+#include <stdcorelib/support/json.h>
+
 #include <opendspx/model.h>
 
 #include <coreplugin/coreglobal.h>
@@ -47,11 +49,11 @@ namespace Core {
             return std::get<Label>(m_data);
         }
 
-        void setKeySignatures(const QList<nlohmann::json> &keySignatures) {
+        void setKeySignatures(const QList<stdc::JsonValue> &keySignatures) {
             m_data = keySignatures;
         }
 
-        QList<nlohmann::json> keySignatures() const {
+        QList<stdc::JsonValue> keySignatures() const {
             return std::get<KeySignature>(m_data);
         }
 
@@ -120,7 +122,7 @@ namespace Core {
         std::variant<
             QList<opendspx::Tempo>,
             QList<opendspx::Label>,
-            QList<nlohmann::json>,
+            QList<stdc::JsonValue>,
             QList<opendspx::Track>,
             QList<std::vector<opendspx::ClipRef>>,
             QList<opendspx::Note>,