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/KeyFrame.cpp
View File

@@ -264,7 +264,7 @@ Json::Value Keyframe::JsonValue() {
}
// Load JSON string into this object
void Keyframe::Json(string value) throw(InvalidJSON) {
void Keyframe::SetJson(string value) throw(InvalidJSON) {
// Parse JSON string into JSON objects
Json::Value root;
@@ -277,7 +277,7 @@ void Keyframe::Json(string value) throw(InvalidJSON) {
try
{
// Set all values that match
Json(root);
SetJsonValue(root);
}
catch (exception e)
{
@@ -287,7 +287,7 @@ void Keyframe::Json(string value) throw(InvalidJSON) {
}
// Load Json::JsonValue into this object
void Keyframe::Json(Json::Value root) {
void Keyframe::SetJsonValue(Json::Value root) {
// mark as dirty
needs_update = true;
@@ -305,7 +305,7 @@ void Keyframe::Json(Json::Value root) {
Point p;
// Load Json into Point
p.Json(existing_point);
p.SetJsonValue(existing_point);
// Add Point to Keyframe
AddPoint(p);