hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'development' into LTS_development

Browse source
This commit is contained in:
Thulinma 2018-12-03 15:04:38 +01:00
commit 5812406139
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/stream.cpp
View file

@ -505,16 +505,17 @@ uint8_t Util::getStreamStatus(const std::string & streamname){
Util::DTSCShmReader::DTSCShmReader(const std::string &pageName){ Util::DTSCShmReader::DTSCShmReader(const std::string &pageName){
rPage.init(pageName, 0); rPage.init(pageName, 0);
if (rPage){ if (rPage){rAcc = Util::RelAccX(rPage.mapped);}
rAcc = Util::RelAccX(rPage.mapped);
}
} }
DTSC::Scan Util::DTSCShmReader::getMember(const std::string &indice){ DTSC::Scan Util::DTSCShmReader::getMember(const std::string &indice){
return DTSC::Scan(rAcc.getPointer("dtsc_data"), rAcc.getSize("dtsc_data")).getMember(indice.c_str()); if (!rPage){return DTSC::Scan();}
return DTSC::Scan(rAcc.getPointer("dtsc_data"), rAcc.getSize("dtsc_data"))
.getMember(indice.c_str());
} }
DTSC::Scan Util::DTSCShmReader::getScan(){ DTSC::Scan Util::DTSCShmReader::getScan(){
if (!rPage){return DTSC::Scan();}
return DTSC::Scan(rAcc.getPointer("dtsc_data"), rAcc.getSize("dtsc_data")); return DTSC::Scan(rAcc.getPointer("dtsc_data"), rAcc.getSize("dtsc_data"));
} }