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

Enhance Json data handling

Browse Source 
- Parsing from string to Json::Value is now done by utility function
  openshot::stringToJson() in Json.cpp, all SetJson() methods call it.
- Expand use of const member functions and args where appropriate.
- Use std::to_string() to format int/float values as strings.
- Correct mentions of nonexistent Json::JsonValue type in docstrings
This commit is contained in:
FeRD (Frank Dana)
2019-12-27 08:51:51 -05:00
parent a1158ee278
commit 22bf6edfba
81 changed files with 483 additions and 945 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/ReaderBase.cpp
View File

@@ -113,8 +113,8 @@ void ReaderBase::DisplayInfo() {
std::cout << "--> " << it->first << ": " << it->second << std::endl;
}
// Generate Json::JsonValue for this object
Json::Value ReaderBase::JsonValue() {
// Generate Json::Value for this object
Json::Value ReaderBase::JsonValue() const {
// Create root json object
Json::Value root;
@@ -160,7 +160,7 @@ Json::Value ReaderBase::JsonValue() {
// Append metadata map
root["metadata"] = Json::Value(Json::objectValue);
std::map<std::string, std::string>::iterator it;
std::map<std::string, std::string>::const_iterator it;
for (it = info.metadata.begin(); it != info.metadata.end(); it++)
root["metadata"][it->first] = it->second;
@@ -168,8 +168,8 @@ Json::Value ReaderBase::JsonValue() {
return root;
}
// Load Json::JsonValue into this object
void ReaderBase::SetJsonValue(Json::Value root) {
// Load Json::Value into this object
void ReaderBase::SetJsonValue(const Json::Value root) {
// Set data from Json (if key is found)
if (!root["has_video"].isNull())
@@ -244,7 +244,7 @@ void ReaderBase::SetJsonValue(Json::Value root) {
info.audio_timebase.den = root["audio_timebase"]["den"].asInt();
}
if (!root["metadata"].isNull() && root["metadata"].isObject()) {
for( Json::Value::iterator itr = root["metadata"].begin() ; itr != root["metadata"].end() ; itr++ ) {
for( Json::Value::const_iterator itr = root["metadata"].begin() ; itr != root["metadata"].end() ; itr++ ) {
std::string key = itr.key().asString();
info.metadata[key] = root["metadata"][key].asString();
}