Merge branch 'development' into LTS_development

This commit is contained in:
Thulinma 2015-04-16 14:39:30 +02:00
commit 32e7893f80

View file

@ -72,7 +72,7 @@ static const char * DBG_LVL_LIST[] = {"NONE", "FAIL", "ERROR", "WARN", "INFO", "
#define SHM_STREAM_INDEX "MstSTRM%s" //%s stream name
#define SHM_TRACK_META "MstTRAK%s@%lu" //%s stream name, %lu track ID
#define SHM_TRACK_INDEX "MstTRID%s@%lu" //%s stream name, %lu track ID
#define SHM_TRACK_DATA "MstDATA%s@%lu+%lu" //%s stream name, %lu track ID, %lu page #
#define SHM_TRACK_DATA "MstDATA%s@%lu_%lu" //%s stream name, %lu track ID, %lu page #
#define SHM_STATISTICS "MstSTAT"
#define SHM_USERS "MstUSER%s" //%s stream name
#define SEM_LIVE "MstLIVE%s" //%s stream name