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

Enhance Json data handling

Browse Source 
- Parsing from string to Json::Value is now done by utility function
  openshot::stringToJson() in Json.cpp, all SetJson() methods call it.
- Expand use of const member functions and args where appropriate.
- Use std::to_string() to format int/float values as strings.
- Correct mentions of nonexistent Json::JsonValue type in docstrings
This commit is contained in:
FeRD (Frank Dana)
2019-12-27 08:51:51 -05:00
parent a1158ee278
commit 22bf6edfba
81 changed files with 483 additions and 945 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/EffectBase.cpp
View File

@@ -74,14 +74,14 @@ int EffectBase::constrain(int color_value)
}
// Generate JSON string of this object
std::string EffectBase::Json() {
std::string EffectBase::Json() const {
// Return formatted string
return JsonValue().toStyledString();
}
// Generate Json::JsonValue for this object
Json::Value EffectBase::JsonValue() {
// Generate Json::Value for this object
Json::Value EffectBase::JsonValue() const {
// Create root json object
Json::Value root = ClipBase::JsonValue(); // get parent properties
@@ -98,24 +98,12 @@ Json::Value EffectBase::JsonValue() {
}
// Load JSON string into this object
void EffectBase::SetJson(std::string value) {
void EffectBase::SetJson(const std::string value) {
// Parse JSON string into JSON objects
Json::Value root;
Json::CharReaderBuilder rbuilder;
Json::CharReader* reader(rbuilder.newCharReader());
std::string errors;
bool success = reader->parse( value.c_str(),
value.c_str() + value.size(), &root, &errors );
delete reader;
if (!success)
// Raise exception
throw InvalidJSON("JSON could not be parsed (or is invalid)");
try
{
const Json::Value root = openshot::stringToJson(value);
// Set all values that match
SetJsonValue(root);
}
@@ -126,8 +114,8 @@ void EffectBase::SetJson(std::string value) {
}
}
// Load Json::JsonValue into this object
void EffectBase::SetJsonValue(Json::Value root) {
// Load Json::Value into this object
void EffectBase::SetJsonValue(const Json::Value root) {
// Set parent data
ClipBase::SetJsonValue(root);
@@ -137,8 +125,8 @@ void EffectBase::SetJsonValue(Json::Value root) {
Order(root["order"].asInt());
}
// Generate Json::JsonValue for this object
Json::Value EffectBase::JsonInfo() {
// Generate Json::Value for this object
Json::Value EffectBase::JsonInfo() const {
// Create root json object
Json::Value root;