shawn/op-pedal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes to handling of path properties in presets.

Browse Source
This commit is contained in:
Robin E. R. Davies
2025-09-04 15:20:56 -04:00
parent 0af57da5dd
commit ac194fbbb5
20 changed files with 231 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/AtomConverter.cpp
+19 -14
View File
@@ -26,6 +26,7 @@
#include <cstddef>
#include <cstring>
#include <sstream>
#include <filesystem>
#include "json.hpp"
#include "ss.hpp"
#include "lv2/atom/util.h"
@@ -90,20 +91,21 @@ std::string AtomConverter::ToString(const LV2_Atom*atom)
}
json_variant AtomConverter::MapPath(const json_variant&json, const std::string &pluginStoragePath)
{
std::string oType = json[OTYPE_TAG].as_string();
if (oType == SHORT_ATOM__Path)
if (json.is_null())
{
std::string path = json["value"].as_string().c_str();
if (path.length() == 0 || path[0] == '/')
{
return json;
return EmptyPath();
}
if (json.is_object() && json[OTYPE_TAG].as_string() == SHORT_ATOM__Path)
{
std::filesystem::path path = json["value"].as_string();
if (path.empty()) {
return EmptyPath();
}
std::string newPath = SS(pluginStoragePath << "/" << path);
json_variant result = json_variant::make_object();
result[OTYPE_TAG] = json_variant(SHORT_ATOM__Path);
result["value"] = newPath;
return result;
if (path.is_relative())
{
path = pluginStoragePath / path;
}
return TypedProperty(SHORT_ATOM__Path,path.string());
}
else {
return json;
@@ -111,8 +113,7 @@ json_variant AtomConverter::MapPath(const json_variant&json, const std::string &
}
json_variant AtomConverter::AbstractPath(const json_variant&json, const std::string &pluginStoragePath)
{
std::string oType = json[OTYPE_TAG].as_string();
if (oType == SHORT_ATOM__Path)
if (json.is_object() && json[OTYPE_TAG].as_string() == SHORT_ATOM__Path)
{
std::string path = json["value"].as_string().c_str();
if (path.length() == 0)
@@ -592,6 +593,10 @@ static bool gEmptyPathInitialized = false;
static std::mutex gInitMutex;
std::string gEmptyPathstring;
json_variant AtomConverter::gEmptyPath = TypedProperty(SHORT_ATOM__Path,std::string(""));
std::string AtomConverter::EmptyPathstring()
{
std::lock_guard lock{gInitMutex};