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

Improved Json methods to correct work with swig and inheritance.

Browse Source
This commit is contained in:
Jonathan Thomas
2013-12-07 21:09:55 -06:00
parent e3d41808b9
commit cd7743fb88
44 changed files with 787 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/EffectBase.cpp
View File

@@ -77,7 +77,7 @@ Json::Value EffectBase::JsonValue() {
}
// Load JSON string into this object
void EffectBase::Json(string value) throw(InvalidJSON) {
void EffectBase::SetJson(string value) throw(InvalidJSON) {
// Parse JSON string into JSON objects
Json::Value root;
@@ -90,7 +90,7 @@ void EffectBase::Json(string value) throw(InvalidJSON) {
try
{
// Set all values that match
Json(root);
SetJsonValue(root);
}
catch (exception e)
{
@@ -100,10 +100,10 @@ void EffectBase::Json(string value) throw(InvalidJSON) {
}
// Load Json::JsonValue into this object
void EffectBase::Json(Json::Value root) {
void EffectBase::SetJsonValue(Json::Value root) {
// Set parent data
ClipBase::Json(root);
ClipBase::SetJsonValue(root);
// Set data from Json (if key is found)
if (root["order"] != Json::nullValue)