Merge branch 'development' into LTS_development

This commit is contained in:
Thulinma 2015-04-14 17:33:35 +02:00
commit 818ffbed33

View file

@ -129,7 +129,7 @@ namespace Mist {
myMeta.vod = false; myMeta.vod = false;
myMeta.live = true; myMeta.live = true;
static char liveSemName[NAME_BUFFER_SIZE]; static char liveSemName[NAME_BUFFER_SIZE];
snprintf(liveSemName, NAME_BUFFER_SIZE, SHM_STREAM_INDEX, config->getString("streamname").c_str()); snprintf(liveSemName, NAME_BUFFER_SIZE, SEM_LIVE, config->getString("streamname").c_str());
IPC::semaphore liveMeta(liveSemName, O_CREAT | O_RDWR, ACCESSPERMS, 1); IPC::semaphore liveMeta(liveSemName, O_CREAT | O_RDWR, ACCESSPERMS, 1);
liveMeta.wait(); liveMeta.wait();
if (!metaPages.count(0) || !metaPages[0].mapped) { if (!metaPages.count(0) || !metaPages[0].mapped) {