musicdsp/audio-river
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] update to ne new ejson API (remove helper)

Browse Source
This commit is contained in:
Edouard DUPIN
2016-04-28 23:46:12 +02:00
parent aa5df52e14
commit 07a56e29ae
8 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
audio/river/io/NodeOrchestra.cpp
View File

@@ -58,19 +58,19 @@ audio::river::io::NodeOrchestra::NodeOrchestra(const std::string& _name, const e
if (tmpObject.exist() == false) {
RIVER_WARNING("missing node : 'map-on' ==> auto map : 'auto:default'");
} else {
typeInterface = tmpObject.getStringValue("interface", audio::orchestra::type_undefined);
typeInterface = tmpObject["interface"].toString().get(audio::orchestra::type_undefined);
if (typeInterface == "auto") {
typeInterface = audio::orchestra::type_undefined;
}
streamName = tmpObject.getStringValue("name", "default");
streamName = tmpObject["name"].toString().get("default");
}
int32_t nbChunk = m_config.getNumberValue("nb-chunk", 1024);
int32_t nbChunk = m_config["nb-chunk"].toNumber().get(1024);
// intanciate specific API ...
m_interface.instanciate(typeInterface);
m_interface.setName(_name);
// TODO : Check return ...
std::string type = m_config.getStringValue("type", "int16");
std::string type = m_config["type"].toString().get("int16");
if (streamName == "") {
streamName = "default";
}
@@ -189,7 +189,7 @@ audio::river::io::NodeOrchestra::NodeOrchestra(const std::string& _name, const e
RIVER_CRITICAL("Can not open hardware device with more channel (" << params.nChannels << ") that is autorized by hardware (" << m_info.channels.size() << ").");
}
audio::orchestra::StreamOptions option;
etk::from_string(option.mode, tmpObject.getStringValue("timestamp-mode", "soft"));
etk::from_string(option.mode, tmpObject["timestamp-mode"].toString().get("soft"));
RIVER_DEBUG("interfaceFormat=" << interfaceFormat);
RIVER_DEBUG("hardwareFormat=" << hardwareFormat);