Added "Hide mainmenu entry" option on server (thanks to Rolf Ahrenberg)

This commit is contained in:
Frank Schmirler 2011-12-08 13:07:17 +01:00
parent afe255aa0b
commit ffb8707118
12 changed files with 37 additions and 9 deletions

View File

@ -39,6 +39,7 @@ Rolf Ahrenberg
for requesting replacement of asprintf calls for requesting replacement of asprintf calls
for suggesting to change the URL path from EXTERN to EXT for suggesting to change the URL path from EXTERN to EXT
for suggesting increased thread priorities for cStreamdevWriter/Streamer for suggesting increased thread priorities for cStreamdevWriter/Streamer
for adding "Hide mainmenu entry" option
Rantanen Teemu Rantanen Teemu
for providing vdr-incompletesections.diff for providing vdr-incompletesections.diff

View File

@ -1,6 +1,7 @@
VDR Plugin 'streamdev' Revision History 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 - Added server menu with list of clients. Connections can be terminated
with the "red" key. The former main menu action of suspending live TV with the "red" key. The former main menu action of suspending live TV
moved to the "blue" key. moved to the "blue" key.

View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: streamdev 0.5.0\n" "Project-Id-Version: streamdev 0.5.0\n"
"Report-Msgid-Bugs-To: <http://www.vdr-developer.org/mantisbt/>\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" "PO-Revision-Date: 2008-03-30 02:11+0200\n"
"Last-Translator: Frank Schmirler <vdrdev@schmirler.de>\n" "Last-Translator: Frank Schmirler <vdrdev@schmirler.de>\n"
"Language-Team: <vdr@linuxtv.org>\n" "Language-Team: <vdr@linuxtv.org>\n"
@ -42,6 +42,9 @@ msgstr "Nie pausiert"
msgid "Common Settings" msgid "Common Settings"
msgstr "Allgemeines" msgstr "Allgemeines"
msgid "Hide Mainmenu Entry"
msgstr "Hauptmenüeintrag verstecken"
msgid "Maximum Number of Clients" msgid "Maximum Number of Clients"
msgstr "Maximalanzahl an Clients" msgstr "Maximalanzahl an Clients"

View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: streamdev 0.5.0\n" "Project-Id-Version: streamdev 0.5.0\n"
"Report-Msgid-Bugs-To: <http://www.vdr-developer.org/mantisbt/>\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" "PO-Revision-Date: 2010-06-19 03:58+0100\n"
"Last-Translator: Javier Bradineras <jbradi@hotmail.com>\n" "Last-Translator: Javier Bradineras <jbradi@hotmail.com>\n"
"Language-Team: <vdr@linuxtv.org>\n" "Language-Team: <vdr@linuxtv.org>\n"
@ -42,6 +42,9 @@ msgstr "Nunca suspendido"
msgid "Common Settings" msgid "Common Settings"
msgstr "Configuración común" msgstr "Configuración común"
msgid "Hide Mainmenu Entry"
msgstr ""
msgid "Maximum Number of Clients" msgid "Maximum Number of Clients"
msgstr "Numero máximo de clientes" msgstr "Numero máximo de clientes"

View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: streamdev 0.5.0\n" "Project-Id-Version: streamdev 0.5.0\n"
"Report-Msgid-Bugs-To: <http://www.vdr-developer.org/mantisbt/>\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" "PO-Revision-Date: 2008-03-30 02:11+0200\n"
"Last-Translator: micky979 <micky979@free.fr>\n" "Last-Translator: micky979 <micky979@free.fr>\n"
"Language-Team: <vdr@linuxtv.org>\n" "Language-Team: <vdr@linuxtv.org>\n"
@ -42,6 +42,9 @@ msgstr "Jamais suspendre"
msgid "Common Settings" msgid "Common Settings"
msgstr "Paramètres communs" msgstr "Paramètres communs"
msgid "Hide Mainmenu Entry"
msgstr ""
msgid "Maximum Number of Clients" msgid "Maximum Number of Clients"
msgstr "Nombre maximun de clients" msgstr "Nombre maximun de clients"

View File

@ -9,7 +9,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: streamdev 0.5.0\n" "Project-Id-Version: streamdev 0.5.0\n"
"Report-Msgid-Bugs-To: <http://www.vdr-developer.org/mantisbt/>\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" "PO-Revision-Date: 2010-06-19 03:58+0100\n"
"Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n" "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
"Language-Team: <vdr@linuxtv.org>\n" "Language-Team: <vdr@linuxtv.org>\n"
@ -44,6 +44,9 @@ msgstr "Mai sospeso"
msgid "Common Settings" msgid "Common Settings"
msgstr "Impostazioni comuni" msgstr "Impostazioni comuni"
msgid "Hide Mainmenu Entry"
msgstr "Nascondi voce menu principale"
msgid "Maximum Number of Clients" msgid "Maximum Number of Clients"
msgstr "Numero massimo di Client" msgstr "Numero massimo di Client"

View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: streamdev 0.5.0\n" "Project-Id-Version: streamdev 0.5.0\n"
"Report-Msgid-Bugs-To: <http://www.vdr-developer.org/mantisbt/>\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" "PO-Revision-Date: 2009-11-26 21:57+0200\n"
"Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n" "Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n"
"Language-Team: Lietuvių\n" "Language-Team: Lietuvių\n"
@ -42,6 +42,9 @@ msgstr "Niekada nestabdyti"
msgid "Common Settings" msgid "Common Settings"
msgstr "Bendri nustatymai" msgstr "Bendri nustatymai"
msgid "Hide Mainmenu Entry"
msgstr ""
msgid "Maximum Number of Clients" msgid "Maximum Number of Clients"
msgstr "Maksimalus klientų skaičius" msgstr "Maksimalus klientų skaičius"

View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: streamdev 0.5.0\n" "Project-Id-Version: streamdev 0.5.0\n"
"Report-Msgid-Bugs-To: <http://www.vdr-developer.org/mantisbt/>\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" "PO-Revision-Date: 2008-06-26 15:36+0100\n"
"Last-Translator: Oleg Roitburd <oleg@roitburd.de>\n" "Last-Translator: Oleg Roitburd <oleg@roitburd.de>\n"
"Language-Team: <vdr@linuxtv.org>\n" "Language-Team: <vdr@linuxtv.org>\n"
@ -42,6 +42,9 @@ msgstr "
msgid "Common Settings" msgid "Common Settings"
msgstr "½ÐáâàÞÙÚØ" msgstr "½ÐáâàÞÙÚØ"
msgid "Hide Mainmenu Entry"
msgstr ""
msgid "Maximum Number of Clients" msgid "Maximum Number of Clients"
msgstr "¼ÐÚá. ÚÞÛØçÕáâÒÞ ÚÛØÕÝâÞÒ" msgstr "¼ÐÚá. ÚÞÛØçÕáâÒÞ ÚÛØÕÝâÞÒ"

View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: streamdev_SK\n" "Project-Id-Version: streamdev_SK\n"
"Report-Msgid-Bugs-To: <http://www.vdr-developer.org/mantisbt/>\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" "PO-Revision-Date: \n"
"Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n" "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
"Language-Team: Slovak <hrala.milan@gmail.com>\n" "Language-Team: Slovak <hrala.milan@gmail.com>\n"
@ -44,6 +44,9 @@ msgstr "Nikdy nepozastavi
msgid "Common Settings" msgid "Common Settings"
msgstr "V¹eobecné nastavenia" msgstr "V¹eobecné nastavenia"
msgid "Hide Mainmenu Entry"
msgstr "Schova» v hlavnom menu"
msgid "Maximum Number of Clients" msgid "Maximum Number of Clients"
msgstr "Maximály poèet klientov" msgstr "Maximály poèet klientov"

View File

@ -10,6 +10,7 @@
cStreamdevServerSetup StreamdevServerSetup; cStreamdevServerSetup StreamdevServerSetup;
cStreamdevServerSetup::cStreamdevServerSetup(void) { cStreamdevServerSetup::cStreamdevServerSetup(void) {
HideMenuEntry = false;
MaxClients = 5; MaxClients = 5;
StartVTPServer = true; StartVTPServer = true;
VTPServerPort = 2004; VTPServerPort = 2004;
@ -27,7 +28,8 @@ cStreamdevServerSetup::cStreamdevServerSetup(void) {
} }
bool cStreamdevServerSetup::SetupParse(const char *Name, const char *Value) { 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, "StartServer") == 0) StartVTPServer = atoi(Value);
else if (strcmp(Name, "ServerPort") == 0) VTPServerPort = atoi(Value); else if (strcmp(Name, "ServerPort") == 0) VTPServerPort = atoi(Value);
else if (strcmp(Name, "VTPBindIP") == 0) strcpy(VTPBindIP, Value); else if (strcmp(Name, "VTPBindIP") == 0) strcpy(VTPBindIP, Value);
@ -76,6 +78,7 @@ void cStreamdevServerMenuSetupPage::Set(void) {
int current = Current(); int current = Current();
Clear(); Clear();
AddCategory (tr("Common Settings")); 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 cMenuEditIntItem (tr("Maximum Number of Clients"), &m_NewSetup.MaxClients, 0, 100));
Add(new cMenuEditStraItem(tr("Suspend behaviour"), &m_NewSetup.SuspendMode, sm_Count, modes)); Add(new cMenuEditStraItem(tr("Suspend behaviour"), &m_NewSetup.SuspendMode, sm_Count, modes));
@ -126,6 +129,7 @@ void cStreamdevServerMenuSetupPage::Store(void) {
cStreamdevServer::Destruct(); cStreamdevServer::Destruct();
} }
SetupStore("HideMenuEntry", m_NewSetup.HideMenuEntry);
SetupStore("MaxClients", m_NewSetup.MaxClients); SetupStore("MaxClients", m_NewSetup.MaxClients);
SetupStore("StartServer", m_NewSetup.StartVTPServer); SetupStore("StartServer", m_NewSetup.StartVTPServer);
SetupStore("ServerPort", m_NewSetup.VTPServerPort); SetupStore("ServerPort", m_NewSetup.VTPServerPort);

View File

@ -12,6 +12,7 @@ struct cStreamdevServerSetup {
bool SetupParse(const char *Name, const char *Value); bool SetupParse(const char *Name, const char *Value);
int HideMenuEntry;
int MaxClients; int MaxClients;
int StartVTPServer; int StartVTPServer;
int VTPServerPort; int VTPServerPort;

View File

@ -119,7 +119,7 @@ cString cPluginStreamdevServer::Active(void)
const char *cPluginStreamdevServer::MainMenuEntry(void) const char *cPluginStreamdevServer::MainMenuEntry(void)
{ {
return tr("Streamdev Connections"); return !StreamdevServerSetup.HideMenuEntry ? tr("Streamdev Connections") : NULL;
} }
cOsdObject *cPluginStreamdevServer::MainMenuAction(void) cOsdObject *cPluginStreamdevServer::MainMenuAction(void)