From 35ddc79c1adf507e460959a19b3eb85ff10f2255 Mon Sep 17 00:00:00 2001 From: Thulinma Date: Tue, 3 Mar 2015 11:33:52 +0100 Subject: [PATCH] added pid/timeout/kill functionality to stats # Conflicts: # src/output/output_rtmp.cpp --- src/input/input.cpp | 2 +- src/output/output.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/input/input.cpp b/src/input/input.cpp index 681f33ac..d96f11d4 100644 --- a/src/input/input.cpp +++ b/src/input/input.cpp @@ -146,7 +146,7 @@ namespace Mist { //after this player functionality metaPage.init(config->getString("streamname"), (isBuffer ? DEFAULT_META_PAGE_SIZE : myMeta.getSendLen()), true); myMeta.writeTo(metaPage.mapped); - userPage.init(config->getString("streamname") + "_users", 30, true); + userPage.init(config->getString("streamname") + "_users", PLAY_EX_SIZE, true); if (!isBuffer){ diff --git a/src/output/output.cpp b/src/output/output.cpp index c8f92394..59b12db7 100644 --- a/src/output/output.cpp +++ b/src/output/output.cpp @@ -247,7 +247,7 @@ namespace Mist { return; } statsPage = IPC::sharedClient("statistics", STAT_EX_SIZE, true); - playerConn = IPC::sharedClient(streamName + "_users", 30, true); + playerConn = IPC::sharedClient(streamName + "_users", PLAY_EX_SIZE , true); updateMeta(); selectDefaultTracks(); sought = false; @@ -729,7 +729,7 @@ namespace Mist { } int tNum = 0; if (!playerConn.getData()){ - playerConn = IPC::sharedClient(streamName + "_users", 30, true); + playerConn = IPC::sharedClient(streamName + "_users", PLAY_EX_SIZE, true); if (!playerConn.getData()){ DEBUG_MSG(DLVL_WARN, "Player connection failure - aborting output"); myConn.close();