zawz/zmidimap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

strval cleanup

Browse source
This commit is contained in:
zawz 2020-02-13 23:18:33 +01:00
parent 0d7213d41a
commit 99f98b165a
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/device.cpp
View file

@ -68,7 +68,7 @@ std::pair<int32_t,int32_t> importRange(const ztd::chunkdat& ch, const std::strin
ztd::chunkdat* pch=ch.subChunkPtr(tag); ztd::chunkdat* pch=ch.subChunkPtr(tag);
if(pch != nullptr) if(pch != nullptr)
{ {
std::string str=pch->strval(); std::string str=*pch;
auto tpos=str.find(':'); auto tpos=str.find(':');
if (str=="*") //whole range if (str=="*") //whole range
{ {
@ -76,14 +76,14 @@ std::pair<int32_t,int32_t> importRange(const ztd::chunkdat& ch, const std::strin
} }
else if(tpos == std::string::npos) //single value else if(tpos == std::string::npos) //single value
{ {
low=stoi(str); low=std::stoi(str);
high=low; high=low;
} }
else //range else //range
{ {
low=stoi(str.substr(0,tpos)); low=std::stoi(str.substr(0,tpos));
tpos++; tpos++;
high=stoi(str.substr(tpos, str.size()-tpos)); high=std::stoi(str.substr(tpos, str.size()-tpos));
} }
} }
return std::make_pair(low, high); return std::make_pair(low, high);
@ -94,7 +94,7 @@ std::pair<float,float> importRangeFloat(const ztd::chunkdat& ch, const std::stri
ztd::chunkdat* pch=ch.subChunkPtr(tag); ztd::chunkdat* pch=ch.subChunkPtr(tag);
if(pch != nullptr) if(pch != nullptr)
{ {
std::string str=pch->strval(); std::string str=*pch;
auto tpos=str.find(':'); auto tpos=str.find(':');
if(tpos == std::string::npos) if(tpos == std::string::npos)
{ {
@ -118,7 +118,7 @@ bool importBool(const ztd::chunkdat& ch, const std::string& tag, const bool& def
ztd::chunkdat* pch=ch.subChunkPtr(tag); ztd::chunkdat* pch=ch.subChunkPtr(tag);
if(pch != nullptr) if(pch != nullptr)
{ {
std::string str=pch->strval(); std::string str=*pch;
if( str == "true" ) if( str == "true" )
return true; return true;
else if( str == "false" ) else if( str == "false" )
@ -130,27 +130,27 @@ bool importBool(const ztd::chunkdat& ch, const std::string& tag, const bool& def
bool Device::import_chunk(const ztd::chunkdat& ch) bool Device::import_chunk(const ztd::chunkdat& ch)
{ {
ztd::chunkdat& cch = ch["commands"]; ztd::chunkdat& cch = ch["commands"];
this->name=dequote(ch["name"].strval()); this->name=dequote(ch["name"]);
for(int i=0 ; i<cch.listSize() ; i++) for(int i=0 ; i<cch.listSize() ; i++)
{ {
ztd::chunkdat& tch=cch[i]; ztd::chunkdat& tch=cch[i];
std::string tstr=tch["type"].strval(); std::string tstr=tch["type"];
if(tstr == "system") //type system if(tstr == "system") //type system
{ {
std::string shell; std::string shell;
shell=tch["shell"].strval(); shell=tch["shell"];
this->sysCommands.push_back(SystemCommand(shell)); this->sysCommands.push_back(SystemCommand(shell));
} }
else if (tstr == "connect") else if (tstr == "connect")
{ {
std::string shell; std::string shell;
shell=tch["shell"].strval(); shell=tch["shell"];
this->connectCommands.push_back(ConnectCommand(shell)); this->connectCommands.push_back(ConnectCommand(shell));
} }
else if (tstr == "disconnect") else if (tstr == "disconnect")
{ {
std::string shell; std::string shell;
shell=tch["shell"].strval(); shell=tch["shell"];
this->disconnectCommands.push_back(DisconnectCommand(shell)); this->disconnectCommands.push_back(DisconnectCommand(shell));
} }
else else
@ -162,13 +162,13 @@ bool Device::import_chunk(const ztd::chunkdat& ch)
std::pair<float,float> floatpair; std::pair<float,float> floatpair;
//channel //channel
if(tch.subChunkPtr("channel") == nullptr || tch["channel"].strval()=="*") if(tch.subChunkPtr("channel") == nullptr || tch["channel"] == "*")
channel=-1; channel=-1;
else else
channel=stoi(tch["channel"].strval()); channel=std::stoi(tch["channel"]);
//shell //shell
shell=tch["shell"].strval(); shell=tch["shell"];
//type //type
if(tstr == "note") //type note if(tstr == "note") //type note