openshot/libopenshot-audio
0
0
Fork 0
mirror of https://github.com/OpenShot/libopenshot-audio.git synced 2026-03-02 08:54:01 -08:00
Code Issues Packages Projects Releases Wiki Activity

Upgrading to JUCE 7.0.8

Browse Source
This commit is contained in:
Jonathan Thomas
2024-12-08 11:52:40 -06:00
parent 3ef80991d2
commit 92141fd2b3
880 changed files with 84780 additions and 27787 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
JuceLibraryCode/modules/juce_core/javascript/juce_JSON.cpp
View File

@@ -2,7 +2,7 @@
==============================================================================
This file is part of the JUCE library.
Copyright (c) 2017 - ROLI Ltd.
Copyright (c) 2022 - Raw Material Software Limited
JUCE is an open source library subject to commercial or open-source
licensing.
@@ -126,6 +126,8 @@ struct JSONParser
break;
}
default: break;
}
}
@@ -429,7 +431,7 @@ struct JSONFormatter
if (! allOnOneLine)
writeSpaces (out, indentLevel + indentSize);
write (out, array.getReference(i), indentLevel + indentSize, allOnOneLine, maximumDecimalPlaces);
write (out, array.getReference (i), indentLevel + indentSize, allOnOneLine, maximumDecimalPlaces);
if (i < array.size() - 1)
{
@@ -543,7 +545,7 @@ Result JSON::parseQuotedString (String::CharPointerType& t, var& result)
//==============================================================================
#if JUCE_UNIT_TESTS
class JSONTests : public UnitTest
class JSONTests final : public UnitTest
{
public:
JSONTests()

2
JuceLibraryCode/modules/juce_core/javascript/juce_JSON.h
View File

@@ -2,7 +2,7 @@
==============================================================================
This file is part of the JUCE library.
Copyright (c) 2017 - ROLI Ltd.
Copyright (c) 2022 - Raw Material Software Limited
JUCE is an open source library subject to commercial or open-source
licensing.

532
JuceLibraryCode/modules/juce_core/javascript/juce_JSONSerialisation.h Normal file
View File

File diff suppressed because it is too large Load Diff

614
JuceLibraryCode/modules/juce_core/javascript/juce_JSONSerialisation_test.cpp Normal file
View File

File diff suppressed because it is too large Load Diff

215
JuceLibraryCode/modules/juce_core/javascript/juce_JSONUtils.cpp Normal file
View File

@@ -0,0 +1,215 @@
/*
==============================================================================
This file is part of the JUCE library.
Copyright (c) 2022 - Raw Material Software Limited
JUCE is an open source library subject to commercial or open-source
licensing.
The code included in this file is provided under the terms of the ISC license
http://www.isc.org/downloads/software-support-policy/isc-license. Permission
To use, copy, modify, and/or distribute this software for any purpose with or
without fee is hereby granted provided that the above copyright notice and
this permission notice appear in all copies.
JUCE IS PROVIDED "AS IS" WITHOUT ANY WARRANTY, AND ALL WARRANTIES, WHETHER
EXPRESSED OR IMPLIED, INCLUDING MERCHANTABILITY AND FITNESS FOR PURPOSE, ARE
DISCLAIMED.
==============================================================================
*/
namespace juce
{
var JSONUtils::makeObject (const std::map<Identifier, var>& source)
{
auto result = std::make_unique<DynamicObject>();
for (const auto& [name, value] : source)
result->setProperty (name, value);
return var (result.release());
}
var JSONUtils::makeObjectWithKeyFirst (const std::map<Identifier, var>& source,
Identifier key)
{
auto result = std::make_unique<DynamicObject>();
if (const auto iter = source.find (key); iter != source.end())
result->setProperty (key, iter->second);
for (const auto& [name, value] : source)
if (name != key)
result->setProperty (name, value);
return var (result.release());
}
std::optional<var> JSONUtils::setPointer (const var& v,
String pointer,
const var& newValue)
{
if (pointer.isEmpty())
return newValue;
if (! pointer.startsWith ("/"))
{
// This is not a well-formed JSON pointer
jassertfalse;
return {};
}
const auto findResult = pointer.indexOfChar (1, '/');
const auto pos = findResult < 0 ? pointer.length() : findResult;
const String head (pointer.begin() + 1, pointer.begin() + pos);
const String tail (pointer.begin() + pos, pointer.end());
const auto unescaped = head.replace ("~1", "/").replace ("~0", "~");
if (auto* object = v.getDynamicObject())
{
if (const auto newProperty = setPointer (object->getProperty (unescaped), tail, newValue))
{
auto cloned = object->clone();
cloned->setProperty (unescaped, *newProperty);
return var (cloned.release());
}
}
else if (auto* array = v.getArray())
{
const auto index = [&]() -> size_t
{
if (unescaped == "-")
return (size_t) array->size();
if (unescaped == "0")
return 0;
if (! unescaped.startsWith ("0"))
return (size_t) unescaped.getLargeIntValue();
return std::numeric_limits<size_t>::max();
}();
if (const auto newIndex = setPointer ((*array)[(int) index], tail, newValue))
{
auto copied = *array;
if ((int) index == copied.size())
copied.add ({});
if (isPositiveAndBelow (index, copied.size()))
{
copied.getReference ((int) index) = *newIndex;
return var (copied);
}
}
}
return {};
}
bool JSONUtils::deepEqual (const var& a, const var& b)
{
const auto compareObjects = [] (const DynamicObject& x, const DynamicObject& y)
{
if (x.getProperties().size() != y.getProperties().size())
return false;
for (const auto& [key, value] : x.getProperties())
{
if (! y.hasProperty (key))
return false;
if (! deepEqual (value, y.getProperty (key)))
return false;
}
return true;
};
if (auto* i = a.getDynamicObject())
if (auto* j = b.getDynamicObject())
return compareObjects (*i, *j);
if (auto* i = a.getArray())
if (auto* j = b.getArray())
return std::equal (i->begin(), i->end(), j->begin(), j->end(), [] (const var& x, const var& y) { return deepEqual (x, y); });
return a == b;
}
//==============================================================================
//==============================================================================
#if JUCE_UNIT_TESTS
class JSONUtilsTests final : public UnitTest
{
public:
JSONUtilsTests() : UnitTest ("JSONUtils", UnitTestCategories::json) {}
void runTest() override
{
beginTest ("JSON pointers");
{
const auto obj = JSON::parse (R"({ "name": "PIANO 4"
, "lfoSpeed": 30
, "lfoWaveform": "triangle"
, "pitchEnvelope": { "rates": [94,67,95,60], "levels": [50,50,50,50] }
})");
expectDeepEqual (JSONUtils::setPointer (obj, "", "hello world"), var ("hello world"));
expectDeepEqual (JSONUtils::setPointer (obj, "/lfoWaveform/foobar", "str"), std::nullopt);
expectDeepEqual (JSONUtils::setPointer (JSON::parse (R"({"foo":0,"bar":1})"), "/foo", 2), JSON::parse (R"({"foo":2,"bar":1})"));
expectDeepEqual (JSONUtils::setPointer (JSON::parse (R"({"foo":0,"bar":1})"), "/baz", 2), JSON::parse (R"({"foo":0,"bar":1,"baz":2})"));
expectDeepEqual (JSONUtils::setPointer (JSON::parse (R"({"foo":{},"bar":{}})"), "/foo/bar", 2), JSON::parse (R"({"foo":{"bar":2},"bar":{}})"));
expectDeepEqual (JSONUtils::setPointer (obj, "/pitchEnvelope/rates/01", "str"), std::nullopt);
expectDeepEqual (JSONUtils::setPointer (obj, "/pitchEnvelope/rates/10", "str"), std::nullopt);
expectDeepEqual (JSONUtils::setPointer (obj, "/lfoSpeed", 10), JSON::parse (R"({ "name": "PIANO 4"
, "lfoSpeed": 10
, "lfoWaveform": "triangle"
, "pitchEnvelope": { "rates": [94,67,95,60], "levels": [50,50,50,50] }
})"));
expectDeepEqual (JSONUtils::setPointer (JSON::parse (R"([0,1,2])"), "/0", "bang"), JSON::parse (R"(["bang",1,2])"));
expectDeepEqual (JSONUtils::setPointer (JSON::parse (R"([0,1,2])"), "/0", "bang"), JSON::parse (R"(["bang",1,2])"));
expectDeepEqual (JSONUtils::setPointer (JSON::parse (R"({"/":"fizz"})"), "/~1", "buzz"), JSON::parse (R"({"/":"buzz"})"));
expectDeepEqual (JSONUtils::setPointer (JSON::parse (R"({"~":"fizz"})"), "/~0", "buzz"), JSON::parse (R"({"~":"buzz"})"));
expectDeepEqual (JSONUtils::setPointer (obj, "/pitchEnvelope/rates/0", 80), JSON::parse (R"({ "name": "PIANO 4"
, "lfoSpeed": 30
, "lfoWaveform": "triangle"
, "pitchEnvelope": { "rates": [80,67,95,60], "levels": [50,50,50,50] }
})"));
expectDeepEqual (JSONUtils::setPointer (obj, "/pitchEnvelope/levels/0", 80), JSON::parse (R"({ "name": "PIANO 4"
, "lfoSpeed": 30
, "lfoWaveform": "triangle"
, "pitchEnvelope": { "rates": [94,67,95,60], "levels": [80,50,50,50] }
})"));
expectDeepEqual (JSONUtils::setPointer (obj, "/pitchEnvelope/levels/-", 100), JSON::parse (R"({ "name": "PIANO 4"
, "lfoSpeed": 30
, "lfoWaveform": "triangle"
, "pitchEnvelope": { "rates": [94,67,95,60], "levels": [50,50,50,50,100] }
})"));
}
}
void expectDeepEqual (const std::optional<var>& a, const std::optional<var>& b)
{
expect (deepEqual (a, b), a.has_value() && b.has_value() ? JSON::toString (*a) + " != " + JSON::toString (*b) : String());
}
static bool deepEqual (const std::optional<var>& a, const std::optional<var>& b)
{
if (a.has_value() && b.has_value())
return JSONUtils::deepEqual (*a, *b);
return a == b;
}
};
static JSONUtilsTests jsonUtilsTests;
#endif
} // namespace juce

67
JuceLibraryCode/modules/juce_core/javascript/juce_JSONUtils.h Normal file
View File

@@ -0,0 +1,67 @@
/*
==============================================================================
This file is part of the JUCE library.
Copyright (c) 2022 - Raw Material Software Limited
JUCE is an open source library subject to commercial or open-source
licensing.
The code included in this file is provided under the terms of the ISC license
http://www.isc.org/downloads/software-support-policy/isc-license. Permission
To use, copy, modify, and/or distribute this software for any purpose with or
without fee is hereby granted provided that the above copyright notice and
this permission notice appear in all copies.
JUCE IS PROVIDED "AS IS" WITHOUT ANY WARRANTY, AND ALL WARRANTIES, WHETHER
EXPRESSED OR IMPLIED, INCLUDING MERCHANTABILITY AND FITNESS FOR PURPOSE, ARE
DISCLAIMED.
==============================================================================
*/
namespace juce
{
/**
A mini namespace to hold utility functions for working with juce::vars.
@tags{Core}
*/
struct JSONUtils
{
/** No constructor. */
JSONUtils() = delete;
/** Given a JSON array/object 'v', a string representing a JSON pointer,
and a new property value 'newValue', returns a copy of 'v' where the
property or array index referenced by the pointer has been set to 'newValue'.
If the pointer cannot be followed, due to referencing missing array indices
or fields, then this returns nullopt.
For more details, check the JSON Pointer RFC 6901:
https://datatracker.ietf.org/doc/html/rfc6901
*/
static std::optional<var> setPointer (const var& v, String pointer, const var& newValue);
/** Converts the provided key/value pairs into a JSON object. */
static var makeObject (const std::map<Identifier, var>& source);
/** Converts the provided key/value pairs into a JSON object with the provided
key at the first position in the object.
This is useful because the MIDI-CI spec requires that certain fields (e.g.
status) should be placed at the beginning of a MIDI-CI header.
*/
static var makeObjectWithKeyFirst (const std::map<Identifier, var>& source, Identifier key);
/** Returns true if and only if the contents of a match the contents of b.
Unlike var::operator==, this will recursively check that contained DynamicObject and Array
instances compare equal.
*/
static bool deepEqual (const var& a, const var& b);
};
} // namespace juce

159
JuceLibraryCode/modules/juce_core/javascript/juce_Javascript.cpp
View File

File diff suppressed because it is too large Load Diff

2
JuceLibraryCode/modules/juce_core/javascript/juce_Javascript.h
View File

@@ -2,7 +2,7 @@
==============================================================================
This file is part of the JUCE library.
Copyright (c) 2017 - ROLI Ltd.
Copyright (c) 2022 - Raw Material Software Limited
JUCE is an open source library subject to commercial or open-source
licensing.