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

Added JSON change method, which accepts a diff / sync JSON array, and applies the changes to a timeline and timeline associated properties and items. Also fixed many bugs on JSON type checking.

Browse Source
This commit is contained in:
Jonathan Thomas
2014-01-08 01:43:58 -06:00
parent 16479fba9d
commit 3c99e53dad
21 changed files with 395 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/TextReader.cpp
View File

@@ -226,25 +226,25 @@ void TextReader::SetJsonValue(Json::Value root) throw(InvalidFile) {
ReaderBase::SetJsonValue(root);
// Set data from Json (if key is found)
if (root["width"] != Json::nullValue)
if (!root["width"].isNull())
width = root["width"].asInt();
if (root["height"] != Json::nullValue)
if (!root["height"].isNull())
height = root["height"].asInt();
if (root["x_offset"] != Json::nullValue)
if (!root["x_offset"].isNull())
x_offset = root["x_offset"].asInt();
if (root["y_offset"] != Json::nullValue)
if (!root["y_offset"].isNull())
y_offset = root["y_offset"].asInt();
if (root["text"] != Json::nullValue)
if (!root["text"].isNull())
text = root["text"].asString();
if (root["font"] != Json::nullValue)
if (!root["font"].isNull())
font = root["font"].asString();
if (root["size"] != Json::nullValue)
if (!root["size"].isNull())
size = root["size"].asDouble();
if (root["text_color"] != Json::nullValue)
if (!root["text_color"].isNull())
text_color = root["text_color"].asString();
if (root["background_color"] != Json::nullValue)
if (!root["background_color"].isNull())
background_color = root["background_color"].asString();
if (root["gravity"] != Json::nullValue)
if (!root["gravity"].isNull())
gravity = (GravityType) root["gravity"].asInt();
// Re-Open path, and re-init everything (if needed)