From 19c847f06632473b87860e576707d17fa61e6d49 Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Wed, 20 Apr 2016 21:19:11 +0200 Subject: [PATCH] [DEV] update new ejson interface --- audio/ess/ess.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/audio/ess/ess.cpp b/audio/ess/ess.cpp index 1e6c26c..ec7cc45 100644 --- a/audio/ess/ess.cpp +++ b/audio/ess/ess.cpp @@ -37,20 +37,20 @@ void audio::ess::unInit() { void audio::ess::soundSetParse(const std::string& _data) { ejson::Document doc; doc.parse(_data); - std::shared_ptr obj = doc.getObject("musics"); - if ( obj != nullptr + ejson::Object obj = doc["musics"].toObject(); + if ( obj.exist() == true && g_music != nullptr) { - for (auto &it : obj->getKeys()) { - std::string file = obj->getStringValue(it); + for (auto &it : obj.getKeys()) { + std::string file = obj.getStringValue(it); EWOLSA_INFO("load Music : '" << it << "' file=" << file); g_music->load(file, it); } } - obj = doc.getObject("effects"); - if ( obj != nullptr + obj = doc["effects"].toObject(); + if ( obj.exist() == true && g_effects != nullptr) { - for (auto &it : obj->getKeys()) { - std::string file = obj->getStringValue(it); + for (auto &it : obj.getKeys()) { + std::string file = obj.getStringValue(it); EWOLSA_INFO("load Effect : '" << it << "' file=" << file); g_effects->load(file, it); }