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 branch 'develop' into json-parsing

Browse Source
This commit is contained in:
Frank Dana
2020-01-20 15:25:40 -05:00
committed by GitHub
parent 09ae8f1e00 49972b21e9
commit 8ea7449363
35 changed files with 966 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/ReaderBase.cpp
View File

@@ -108,9 +108,8 @@ void ReaderBase::DisplayInfo() {
std::cout << "----------------------------" << std::endl;
// Iterate through metadata
std::map<std::string, std::string>::iterator it;
for (it = info.metadata.begin(); it != info.metadata.end(); it++)
std::cout << "--> " << it->first << ": " << it->second << std::endl;
for (auto it : info.metadata)
std::cout << "--> " << it.first << ": " << it.second << std::endl;
}
// Generate Json::Value for this object
@@ -160,9 +159,9 @@ Json::Value ReaderBase::JsonValue() const {
// Append metadata map
root["metadata"] = Json::Value(Json::objectValue);
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;
for (const auto it : info.metadata)
root["metadata"][it.first] = it.second;
// return JsonValue
return root;