summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank Schmirler <vdr@schmirler.de>2011-12-08 13:07:17 +0100
committerFrank Schmirler <vdr@schmirler.de>2011-12-08 13:07:17 +0100
commitffb870711886b00b500b7fad452a7925859bc98e (patch)
tree0f701d784c6d0164f24fc92e8c636c62cf8c0be2
parentafe255aa0b66732c216660c3cead34d07ca67ef8 (diff)
downloadvdr-plugin-streamdev-ffb870711886b00b500b7fad452a7925859bc98e.tar.gz
vdr-plugin-streamdev-ffb870711886b00b500b7fad452a7925859bc98e.tar.bz2
Added "Hide mainmenu entry" option on server (thanks to Rolf Ahrenberg)
Diffstat
-rw-r--r--CONTRIBUTORS1
-rw-r--r--HISTORY1
-rw-r--r--server/po/de_DE.po5
-rw-r--r--server/po/es_ES.po5
-rw-r--r--server/po/fr_FR.po5
-rw-r--r--server/po/it_IT.po5
-rw-r--r--server/po/lt_LT.po5
-rw-r--r--server/po/ru_RU.po5
-rw-r--r--server/po/sk_SK.po5
-rw-r--r--server/setup.c6
-rw-r--r--server/setup.h1
-rw-r--r--server/streamdev-server.c2
12 files changed, 37 insertions, 9 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index f0e7c92..1331eeb 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -39,6 +39,7 @@ Rolf Ahrenberg
for requesting replacement of asprintf calls
for suggesting to change the URL path from EXTERN to EXT
for suggesting increased thread priorities for cStreamdevWriter/Streamer
+ for adding "Hide mainmenu entry" option
Rantanen Teemu
for providing vdr-incompletesections.diff
diff --git a/HISTORY b/HISTORY
index 557601e..b54d01a 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,6 +1,7 @@
VDR Plugin 'streamdev' Revision History
---------------------------------------
+- Added "Hide mainmenu entry" option on server (thanks to Rolf Ahrenberg)
- Added server menu with list of clients. Connections can be terminated
with the "red" key. The former main menu action of suspending live TV
moved to the "blue" key.
diff --git a/server/po/de_DE.po b/server/po/de_DE.po
index 800f1e9..382d0c0 100644
--- a/server/po/de_DE.po
+++ b/server/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: streamdev 0.5.0\n"
"Report-Msgid-Bugs-To: <http://www.vdr-developer.org/mantisbt/>\n"
-"POT-Creation-Date: 2011-11-22 01:05+0100\n"
+"POT-Creation-Date: 2011-12-08 12:50+0100\n"
"PO-Revision-Date: 2008-03-30 02:11+0200\n"
"Last-Translator: Frank Schmirler <vdrdev@schmirler.de>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -42,6 +42,9 @@ msgstr "Nie pausiert"
msgid "Common Settings"
msgstr "Allgemeines"
+msgid "Hide Mainmenu Entry"
+msgstr "Hauptmeneintrag verstecken"
+
msgid "Maximum Number of Clients"
msgstr "Maximalanzahl an Clients"
diff --git a/server/po/es_ES.po b/server/po/es_ES.po
index db1625b..1a4c6af 100644
--- a/server/po/es_ES.po
+++ b/server/po/es_ES.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: streamdev 0.5.0\n"
"Report-Msgid-Bugs-To: <http://www.vdr-developer.org/mantisbt/>\n"
-"POT-Creation-Date: 2011-11-22 01:05+0100\n"
+"POT-Creation-Date: 2011-12-08 12:50+0100\n"
"PO-Revision-Date: 2010-06-19 03:58+0100\n"
"Last-Translator: Javier Bradineras <jbradi@hotmail.com>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -42,6 +42,9 @@ msgstr "Nunca suspendido"
msgid "Common Settings"
msgstr "Configuracin comn"
+msgid "Hide Mainmenu Entry"
+msgstr ""
+
msgid "Maximum Number of Clients"
msgstr "Numero mximo de clientes"
diff --git a/server/po/fr_FR.po b/server/po/fr_FR.po
index a77b330..70b5c60 100644
--- a/server/po/fr_FR.po
+++ b/server/po/fr_FR.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: streamdev 0.5.0\n"
"Report-Msgid-Bugs-To: <http://www.vdr-developer.org/mantisbt/>\n"
-"POT-Creation-Date: 2011-11-22 01:05+0100\n"
+"POT-Creation-Date: 2011-12-08 12:50+0100\n"
"PO-Revision-Date: 2008-03-30 02:11+0200\n"
"Last-Translator: micky979 <micky979@free.fr>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -42,6 +42,9 @@ msgstr "Jamais suspendre"
msgid "Common Settings"
msgstr "Paramtres communs"
+msgid "Hide Mainmenu Entry"
+msgstr ""
+
msgid "Maximum Number of Clients"
msgstr "Nombre maximun de clients"
diff --git a/server/po/it_IT.po b/server/po/it_IT.po
index 78409f6..0cab4b1 100644
--- a/server/po/it_IT.po
+++ b/server/po/it_IT.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: streamdev 0.5.0\n"
"Report-Msgid-Bugs-To: <http://www.vdr-developer.org/mantisbt/>\n"
-"POT-Creation-Date: 2011-11-22 01:05+0100\n"
+"POT-Creation-Date: 2011-12-08 12:50+0100\n"
"PO-Revision-Date: 2010-06-19 03:58+0100\n"
"Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -44,6 +44,9 @@ msgstr "Mai sospeso"
msgid "Common Settings"
msgstr "Impostazioni comuni"
+msgid "Hide Mainmenu Entry"
+msgstr "Nascondi voce menu principale"
+
msgid "Maximum Number of Clients"
msgstr "Numero massimo di Client"
diff --git a/server/po/lt_LT.po b/server/po/lt_LT.po
index 7bcbe15..df630d0 100644
--- a/server/po/lt_LT.po
+++ b/server/po/lt_LT.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: streamdev 0.5.0\n"
"Report-Msgid-Bugs-To: <http://www.vdr-developer.org/mantisbt/>\n"
-"POT-Creation-Date: 2011-11-22 01:05+0100\n"
+"POT-Creation-Date: 2011-12-08 12:50+0100\n"
"PO-Revision-Date: 2009-11-26 21:57+0200\n"
"Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n"
"Language-Team: Lietuvių\n"
@@ -42,6 +42,9 @@ msgstr "Niekada nestabdyti"
msgid "Common Settings"
msgstr "Bendri nustatymai"
+msgid "Hide Mainmenu Entry"
+msgstr ""
+
msgid "Maximum Number of Clients"
msgstr "Maksimalus klientų skaičius"
diff --git a/server/po/ru_RU.po b/server/po/ru_RU.po
index 1def219..203030d 100644
--- a/server/po/ru_RU.po
+++ b/server/po/ru_RU.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: streamdev 0.5.0\n"
"Report-Msgid-Bugs-To: <http://www.vdr-developer.org/mantisbt/>\n"
-"POT-Creation-Date: 2011-11-22 01:05+0100\n"
+"POT-Creation-Date: 2011-12-08 12:50+0100\n"
"PO-Revision-Date: 2008-06-26 15:36+0100\n"
"Last-Translator: Oleg Roitburd <oleg@roitburd.de>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -42,6 +42,9 @@ msgstr " "
msgid "Common Settings"
msgstr ""
+msgid "Hide Mainmenu Entry"
+msgstr ""
+
msgid "Maximum Number of Clients"
msgstr ". "
diff --git a/server/po/sk_SK.po b/server/po/sk_SK.po
index c61ccfe..1eec849 100644
--- a/server/po/sk_SK.po
+++ b/server/po/sk_SK.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: streamdev_SK\n"
"Report-Msgid-Bugs-To: <http://www.vdr-developer.org/mantisbt/>\n"
-"POT-Creation-Date: 2011-11-22 01:05+0100\n"
+"POT-Creation-Date: 2011-12-08 12:50+0100\n"
"PO-Revision-Date: \n"
"Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
"Language-Team: Slovak <hrala.milan@gmail.com>\n"
@@ -44,6 +44,9 @@ msgstr "Nikdy nepozastavi"
msgid "Common Settings"
msgstr "Veobecn nastavenia"
+msgid "Hide Mainmenu Entry"
+msgstr "Schova v hlavnom menu"
+
msgid "Maximum Number of Clients"
msgstr "Maximly poet klientov"
diff --git a/server/setup.c b/server/setup.c
index 8c9b8ad..6acf3ac 100644
--- a/server/setup.c
+++ b/server/setup.c
@@ -10,6 +10,7 @@
cStreamdevServerSetup StreamdevServerSetup;
cStreamdevServerSetup::cStreamdevServerSetup(void) {
+ HideMenuEntry = false;
MaxClients = 5;
StartVTPServer = true;
VTPServerPort = 2004;
@@ -27,7 +28,8 @@ cStreamdevServerSetup::cStreamdevServerSetup(void) {
}
bool cStreamdevServerSetup::SetupParse(const char *Name, const char *Value) {
- if (strcmp(Name, "MaxClients") == 0) MaxClients = atoi(Value);
+ if (strcmp(Name, "HideMenuEntry") == 0) HideMenuEntry = atoi(Value);
+ else if (strcmp(Name, "MaxClients") == 0) MaxClients = atoi(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);
@@ -76,6 +78,7 @@ void cStreamdevServerMenuSetupPage::Set(void) {
int current = Current();
Clear();
AddCategory (tr("Common Settings"));
+ Add(new cMenuEditBoolItem(tr("Hide Mainmenu Entry"), &m_NewSetup.HideMenuEntry));
Add(new cMenuEditIntItem (tr("Maximum Number of Clients"), &m_NewSetup.MaxClients, 0, 100));
Add(new cMenuEditStraItem(tr("Suspend behaviour"), &m_NewSetup.SuspendMode, sm_Count, modes));
@@ -126,6 +129,7 @@ void cStreamdevServerMenuSetupPage::Store(void) {
cStreamdevServer::Destruct();
}
+ SetupStore("HideMenuEntry", m_NewSetup.HideMenuEntry);
SetupStore("MaxClients", m_NewSetup.MaxClients);
SetupStore("StartServer", m_NewSetup.StartVTPServer);
SetupStore("ServerPort", m_NewSetup.VTPServerPort);
diff --git a/server/setup.h b/server/setup.h
index 9f06aac..0baa66e 100644
--- a/server/setup.h
+++ b/server/setup.h
@@ -12,6 +12,7 @@ struct cStreamdevServerSetup {
bool SetupParse(const char *Name, const char *Value);
+ int HideMenuEntry;
int MaxClients;
int StartVTPServer;
int VTPServerPort;
diff --git a/server/streamdev-server.c b/server/streamdev-server.c
index f2fa057..849ad3b 100644
--- a/server/streamdev-server.c
+++ b/server/streamdev-server.c
@@ -119,7 +119,7 @@ cString cPluginStreamdevServer::Active(void)
const char *cPluginStreamdevServer::MainMenuEntry(void)
{
- return tr("Streamdev Connections");
+ return !StreamdevServerSetup.HideMenuEntry ? tr("Streamdev Connections") : NULL;
}
cOsdObject *cPluginStreamdevServer::MainMenuAction(void)
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-21 13:08:32 +0000