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
This commit is contained in:
Thulinma 2017-06-23 15:06:59 +02:00
commit 0e1a18986a
6 changed files with 358 additions and 250 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/stream.cpp
View file

@ -472,7 +472,7 @@ static std::string strftime_now(const std::string& format) {
return buffer;
}
uint8_t Util::getStreamStatus(std::string & streamname){
uint8_t Util::getStreamStatus(const 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);