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

Merge pull request #396 from ferdnyc/json-parsing

Browse Source 
Behind-the-scenes code tidying for Json data handling
This commit is contained in:
Jonathan Thomas
2020-02-27 15:32:05 -06:00
committed by GitHub
parent 4ddf775cdf 8ea7449363
commit 4f591c7b94
82 changed files with 532 additions and 938 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/FFmpegReader.cpp
View File

@@ -2434,14 +2434,14 @@ int64_t FFmpegReader::GetSmallestAudioFrame() {
}
// Generate JSON string of this object
std::string FFmpegReader::Json() {
std::string FFmpegReader::Json() const {
// Return formatted string
return JsonValue().toStyledString();
}
// Generate Json::JsonValue for this object
Json::Value FFmpegReader::JsonValue() {
// Generate Json::Value for this object
Json::Value FFmpegReader::JsonValue() const {
// Create root json object
Json::Value root = ReaderBase::JsonValue(); // get parent properties
@@ -2453,23 +2453,11 @@ Json::Value FFmpegReader::JsonValue() {
}
// Load JSON string into this object
void FFmpegReader::SetJson(std::string value) {
void FFmpegReader::SetJson(const std::string value) {
// Parse JSON string into JSON objects
Json::Value root;
Json::CharReaderBuilder rbuilder;
Json::CharReader* reader(rbuilder.newCharReader());
std::string errors;
bool success = reader->parse(value.c_str(), value.c_str() + value.size(),
&root, &errors);
delete reader;
if (!success)
// Raise exception
throw InvalidJSON("JSON could not be parsed (or is invalid)");
try {
const Json::Value root = openshot::stringToJson(value);
// Set all values that match
SetJsonValue(root);
}
@@ -2479,8 +2467,8 @@ void FFmpegReader::SetJson(std::string value) {
}
}
// Load Json::JsonValue into this object
void FFmpegReader::SetJsonValue(Json::Value root) {
// Load Json::Value into this object
void FFmpegReader::SetJsonValue(const Json::Value root) {
// Set parent data
ReaderBase::SetJsonValue(root);