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

Merge branch 'development' into LTS_development

Browse source 
# Conflicts:
#	lib/stream.cpp
#	src/input/input.cpp
This commit is contained in:
Thulinma 2017-06-22 14:07:54 +02:00
commit 0ca63d1440
6 changed files with 27 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/stream.cpp
View file

@ -472,3 +472,11 @@ static std::string strftime_now(const std::string& format) {
return buffer;
}
uint8_t Util::getStreamStatus(std::string & streamname){
char pageName[NAME_BUFFER_SIZE];
snprintf(pageName, NAME_BUFFER_SIZE, SHM_STREAM_STATE, streamname.c_str());
IPC::sharedPage streamStatus(pageName, 1, false, false);
if (!streamStatus){return STRMSTAT_OFF;}
return streamStatus.mapped[0];
}