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

EffectBase: Fix JSON signatures

Browse Source
This commit is contained in:
FeRD (Frank Dana)
2021-06-04 20:07:19 -04:00
parent 5df3f8aef0
commit c04ce9dbe8
2 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/EffectBase.cpp
View File

@@ -29,6 +29,7 @@
*/
#include "EffectBase.h"
#include "Exceptions.h"
#include "Timeline.h"
@@ -106,7 +107,7 @@ Json::Value EffectBase::JsonValue() const {
}
// 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
try
@@ -123,7 +124,7 @@ void EffectBase::SetJson(std::string value) {
}
// Load Json::Value into this object
void EffectBase::SetJsonValue(Json::Value root) {
void EffectBase::SetJsonValue(const Json::Value root) {
if (ParentTimeline()){
// Get parent timeline
@@ -133,34 +134,37 @@ void EffectBase::SetJsonValue(Json::Value root) {
std::list<EffectBase*> effects = parentTimeline->ClipEffects();
// TODO: Fix recursive call for Object Detection
// // Loop through the effects and check if we have a child effect linked to this effect
for (auto const& effect : effects){
// Set the properties of all effects which parentEffect points to this
if ((effect->info.parent_effect_id == this->Id()) && (effect->Id() != this->Id()))
effect->SetJsonValue(root);
effect->SetJsonValue(root);
}
}
// Set this effect properties with the parent effect properties (except the id and parent_effect_id)
Json::Value my_root;
if (parentEffect){
root = parentEffect->JsonValue();
root["id"] = this->Id();
root["parent_effect_id"] = this->info.parent_effect_id;
}
my_root = parentEffect->JsonValue();
my_root["id"] = this->Id();
my_root["parent_effect_id"] = this->info.parent_effect_id;
} else {
my_root = root;
}
// Set parent data
ClipBase::SetJsonValue(root);
ClipBase::SetJsonValue(my_root);
// Set data from Json (if key is found)
if (!root["order"].isNull())
Order(root["order"].asInt());
if (!my_root["order"].isNull())
Order(my_root["order"].asInt());
if (!root["parent_effect_id"].isNull()){
info.parent_effect_id = root["parent_effect_id"].asString();
if (!my_root["parent_effect_id"].isNull()){
info.parent_effect_id = my_root["parent_effect_id"].asString();
if (info.parent_effect_id.size() > 0 && info.parent_effect_id != "" && parentEffect == NULL)
SetParentEffect(info.parent_effect_id);
else
else
parentEffect = NULL;
}
}
@@ -192,7 +196,7 @@ void EffectBase::ParentClip(openshot::ClipBase* new_clip) {
// Set the parent effect from which this properties will be set to
void EffectBase::SetParentEffect(std::string parentEffect_id) {
// Get parent Timeline
Timeline* parentTimeline = (Timeline *) ParentTimeline();
@@ -210,7 +214,7 @@ void EffectBase::SetParentEffect(std::string parentEffect_id) {
EffectJSON["id"] = this->Id();
EffectJSON["parent_effect_id"] = this->info.parent_effect_id;
this->SetJsonValue(EffectJSON);
}
}
}
return;
}
@@ -221,4 +225,4 @@ std::string EffectBase::ParentClipId() const{
return clip->Id();
else
return "";
}
}