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

Working multi-input

Browse source
This commit is contained in:
Erik Zandvliet 2015-04-02 09:56:47 +02:00
parent 9b6312ca01
commit d370ef4eac
31 changed files with 1264 additions and 690 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/controller/controller_statistics.cpp
View file

@ -85,7 +85,7 @@ bool Controller::sessIndex::operator>= (const Controller::sessIndex &b) const{
/// old statistics that have disconnected over 10 minutes ago.
void Controller::SharedMemStats(void * config){
DEBUG_MSG(DLVL_HIGH, "Starting stats thread");
IPC::sharedServer statServer("statistics", STAT_EX_SIZE, true);
IPC::sharedServer statServer(SHM_STATISTICS, STAT_EX_SIZE, true);
while(((Util::Config*)config)->is_active){
{
tthread::lock_guard<tthread::mutex> guard(statsMutex);

4
src/controller/controller_streams.cpp
View file

@ -59,7 +59,9 @@ namespace Controller {
//push-style stream
if (hasViewers(name)){
data["meta"].null();
IPC::sharedPage streamIndex(name, DEFAULT_META_PAGE_SIZE, false, false);
char streamPageName[NAME_BUFFER_SIZE];
snprintf(streamPageName, NAME_BUFFER_SIZE, SHM_STREAM_INDEX, name.c_str());
IPC::sharedPage streamIndex(streamPageName, DEFAULT_META_PAGE_SIZE, false, false);
if (!streamIndex.mapped){
return;
}