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

64
src/ChunkReader.cpp
View File

@@ -251,4 +251,68 @@ tr1::shared_ptr<Frame> ChunkReader::GetFrame(int requested_frame) throw(ReaderCl
return last_frame;
}
// Generate JSON string of this object
string ChunkReader::Json() {
// Return formatted string
return JsonValue().toStyledString();
}
// Generate Json::JsonValue for this object
Json::Value ChunkReader::JsonValue() {
// Create root json object
Json::Value root = ReaderBase::JsonValue(); // get parent properties
root["type"] = "ChunkReader";
root["path"] = path;
root["chunk_size"] = chunk_size;
root["chunk_version"] = version;
// return JsonValue
return root;
}
// Load JSON string into this object
void ChunkReader::SetJson(string value) throw(InvalidJSON) {
// Parse JSON string into JSON objects
Json::Value root;
Json::Reader reader;
bool success = reader.parse( value, root );
if (!success)
// Raise exception
throw InvalidJSON("JSON could not be parsed (or is invalid)", "");
try
{
// Set all values that match
SetJsonValue(root);
}
catch (exception e)
{
// Error parsing JSON (or missing keys)
throw InvalidJSON("JSON is invalid (missing keys or invalid data types)", "");
}
}
// Load Json::JsonValue into this object
void ChunkReader::SetJsonValue(Json::Value root) throw(InvalidFile) {
// Set parent data
ReaderBase::SetJsonValue(root);
// Set data from Json (if key is found)
if (root["path"] != Json::nullValue)
path = root["path"].asString();
if (root["chunk_size"] != Json::nullValue)
chunk_size = root["chunk_size"].asInt();
if (root["chunk_version"] != Json::nullValue)
version = (ChunkVersion) root["chunk_version"].asInt();
// Re-Open path, and re-init everything (if needed)
if (is_open)
{
Close();
Open();
}
}