summaryrefslogtreecommitdiff
path: root/server/setup.c
diff options
context:
space:
mode:
authorFrank Schmirler <vdr@schmirler.de>2011-12-11 17:03:09 +0100
committerFrank Schmirler <vdr@schmirler.de>2011-12-11 17:03:09 +0100
commitba7c61fb3901eb08eec4662c355f8e4275d68c61 (patch)
tree12204dc365624ea9ffea96e084b7b1586da8f541 /server/setup.c
parent6a971b9145b1be99039b653c44b0884de687110f (diff)
downloadvdr-plugin-streamdev-ba7c61fb3901eb08eec4662c355f8e4275d68c61.tar.gz
vdr-plugin-streamdev-ba7c61fb3901eb08eec4662c355f8e4275d68c61.tar.bz2
Support for non-cycle-free setups (e.g. where two VDRs mutually share
their DVB cards through streamdev-client/-server). Must be enabled in streamdev-server setup. Obsoletes recursion patches.
Diffstat (limited to 'server/setup.c')
-rw-r--r--server/setup.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/server/setup.c b/server/setup.c
index 6acf3ac..381b8d8 100644
--- a/server/setup.c
+++ b/server/setup.c
@@ -14,6 +14,7 @@ cStreamdevServerSetup::cStreamdevServerSetup(void) {
MaxClients = 5;
StartVTPServer = true;
VTPServerPort = 2004;
+ LoopPrevention = false;
StartHTTPServer = true;
HTTPServerPort = 3000;
HTTPStreamType = stTS;
@@ -33,6 +34,7 @@ bool cStreamdevServerSetup::SetupParse(const char *Name, const char *Value) {
else if (strcmp(Name, "StartServer") == 0) StartVTPServer = atoi(Value);
else if (strcmp(Name, "ServerPort") == 0) VTPServerPort = atoi(Value);
else if (strcmp(Name, "VTPBindIP") == 0) strcpy(VTPBindIP, Value);
+ else if (strcmp(Name, "LoopPrevention") == 0) LoopPrevention = atoi(Value);
else if (strcmp(Name, "StartHTTPServer") == 0) StartHTTPServer = atoi(Value);
else if (strcmp(Name, "HTTPServerPort") == 0) HTTPServerPort = atoi(Value);
else if (strcmp(Name, "HTTPStreamType") == 0) HTTPStreamType = atoi(Value);
@@ -89,6 +91,8 @@ void cStreamdevServerMenuSetupPage::Set(void) {
Add(new cMenuEditBoolItem(tr("Start VDR-to-VDR Server"), &m_NewSetup.StartVTPServer));
Add(new cMenuEditIntItem (tr("VDR-to-VDR Server Port"), &m_NewSetup.VTPServerPort, 0, 65535));
Add(new cMenuEditIpItem (tr("Bind to IP"), m_NewSetup.VTPBindIP));
+ if (cPluginManager::CallFirstService(LOOP_PREVENTION_SERVICE))
+ Add(new cMenuEditBoolItem(tr("Loop Prevention"), &m_NewSetup.LoopPrevention));
AddCategory (tr("HTTP Server"));
Add(new cMenuEditBoolItem(tr("Start HTTP Server"), &m_NewSetup.StartHTTPServer));
@@ -134,6 +138,7 @@ void cStreamdevServerMenuSetupPage::Store(void) {
SetupStore("StartServer", m_NewSetup.StartVTPServer);
SetupStore("ServerPort", m_NewSetup.VTPServerPort);
SetupStore("VTPBindIP", m_NewSetup.VTPBindIP);
+ SetupStore("LoopPrevention", m_NewSetup.LoopPrevention);
SetupStore("StartHTTPServer", m_NewSetup.StartHTTPServer);
SetupStore("HTTPServerPort", m_NewSetup.HTTPServerPort);
SetupStore("HTTPStreamType", m_NewSetup.HTTPStreamType);