frodovdr
/
vdr
mirror of https://github.com/VDR4Arch/vdr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

SVDRP peering can now be limited to the default SVDRP host

This commit is contained in:
Klaus Schmidinger 2017-06-30 09:50:44 +02:00
parent a28d92d049
commit 363dee6846
33 changed files with 228 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
HISTORY
View File

@ -9130,7 +9130,7 @@ Video Disk Recorder Revision History
before including tools.h in case some plugin needs to use the STL and gets error before including tools.h in case some plugin needs to use the STL and gets error
messages regarding one of the template functions defined in tools.h. messages regarding one of the template functions defined in tools.h.
2017-06-25: Version 2.3.8 2017-06-30: Version 2.3.8
- Updated links in the INSTALL file (thanks to Chris Mayo). - Updated links in the INSTALL file (thanks to Chris Mayo).
- Fixed detecting whether a CAM replies to queries, which didn't work on some systems - Fixed detecting whether a CAM replies to queries, which didn't work on some systems
@ -9160,3 +9160,4 @@ Video Disk Recorder Revision History
UPDR is now sent to all peer VDRs, so that they will update their recordings list. UPDR is now sent to all peer VDRs, so that they will update their recordings list.
This is especially useful if one VDR mounts the video directory of an other one into This is especially useful if one VDR mounts the video directory of an other one into
a subdirectory. a subdirectory.
- SVDRP peering can now be limited to the default SVDRP host (see MANUAL for details).

12
MANUAL
View File

@ -1085,8 +1085,16 @@ Version 2.2
connection after which the connection is automatically connection after which the connection is automatically
closed. Default is 300, a value of 0 means no timeout. closed. Default is 300, a value of 0 means no timeout.
SVDRP peering = no Activates automatic connections between VDRs in the same SVDRP peering = off Activates automatic connections between VDRs in the same
network. network. If set to "any hosts" this VDR will establish
connections with any available hosts. If set to "only
default host" this VDR will only connect to the VDR with
the name defined in "SVDRP default host". If no default
host has been defined, the behavior is the same as with
"any hosts". To switch from "off" to "only default host",
you may need to select "any hosts" first and confirm the
dialog by pressing "Ok" in order to be able to select a
default host.
SVDRP host name The name of this VDR, which is used when connecting VDRs SVDRP host name The name of this VDR, which is used when connecting VDRs
via SVDRP. By default, the machine's host name is used. via SVDRP. By default, the machine's host name is used.

8
menu.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: menu.c 4.40 2017/06/25 10:02:09 kls Exp $ * $Id: menu.c 4.41 2017/06/30 09:49:39 kls Exp $
*/ */
#include "menu.h" #include "menu.h"
@ -4023,6 +4023,7 @@ void cMenuSetupReplay::Store(void)
class cMenuSetupMisc : public cMenuSetupBase { class cMenuSetupMisc : public cMenuSetupBase {
private: private:
const char *svdrpPeeringModeTexts[3];
const char *showChannelNamesWithSourceTexts[3]; const char *showChannelNamesWithSourceTexts[3];
cStringList svdrpServerNames; cStringList svdrpServerNames;
void Set(void); void Set(void);
@ -4034,6 +4035,9 @@ public:
cMenuSetupMisc::cMenuSetupMisc(void) cMenuSetupMisc::cMenuSetupMisc(void)
{ {
SetMenuCategory(mcSetupMisc); SetMenuCategory(mcSetupMisc);
svdrpPeeringModeTexts[0] = tr("off");
svdrpPeeringModeTexts[1] = tr("any hosts");
svdrpPeeringModeTexts[2] = tr("only default host");
showChannelNamesWithSourceTexts[0] = tr("off"); showChannelNamesWithSourceTexts[0] = tr("off");
showChannelNamesWithSourceTexts[1] = tr("type"); showChannelNamesWithSourceTexts[1] = tr("type");
showChannelNamesWithSourceTexts[2] = tr("full"); showChannelNamesWithSourceTexts[2] = tr("full");
@ -4048,7 +4052,7 @@ void cMenuSetupMisc::Set(void)
Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$Min. event timeout (min)"), &data.MinEventTimeout)); Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$Min. event timeout (min)"), &data.MinEventTimeout));
Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$Min. user inactivity (min)"), &data.MinUserInactivity)); Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$Min. user inactivity (min)"), &data.MinUserInactivity));
Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$SVDRP timeout (s)"), &data.SVDRPTimeout)); Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$SVDRP timeout (s)"), &data.SVDRPTimeout));
Add(new cMenuEditBoolItem(tr("Setup.Miscellaneous$SVDRP peering"), &data.SVDRPPeering)); Add(new cMenuEditStraItem(tr("Setup.Miscellaneous$SVDRP peering"), &data.SVDRPPeering, 3, svdrpPeeringModeTexts));
if (data.SVDRPPeering) { if (data.SVDRPPeering) {
Add(new cMenuEditStrItem( tr("Setup.Miscellaneous$SVDRP host name"), data.SVDRPHostName, sizeof(data.SVDRPHostName))); Add(new cMenuEditStrItem( tr("Setup.Miscellaneous$SVDRP host name"), data.SVDRPHostName, sizeof(data.SVDRPHostName)));
if (GetSVDRPServerNames(&svdrpServerNames)) { if (GetSVDRPServerNames(&svdrpServerNames)) {

8
po/ar.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 2.2.0\n" "Project-Id-Version: VDR 2.2.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2017-06-10 17:19+0200\n" "POT-Creation-Date: 2017-06-30 11:46+0200\n"
"PO-Revision-Date: 2008-10-16 11:16-0400\n" "PO-Revision-Date: 2008-10-16 11:16-0400\n"
"Last-Translator: Osama Alrawab <alrawab@hotmail.com>\n" "Last-Translator: Osama Alrawab <alrawab@hotmail.com>\n"
"Language-Team: Arabic <ar@li.org>\n" "Language-Team: Arabic <ar@li.org>\n"
@ -1302,6 +1302,12 @@ msgstr ""
msgid "Setup.Replay$Resume ID" msgid "Setup.Replay$Resume ID"
msgstr "رقم المواصلة" msgstr "رقم المواصلة"
msgid "any hosts"
msgstr ""
msgid "only default host"
msgstr ""
msgid "type" msgid "type"
msgstr "" msgstr ""

8
po/ca_ES.po
View File

@ -10,7 +10,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 2.2.0\n" "Project-Id-Version: VDR 2.2.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2017-06-10 17:19+0200\n" "POT-Creation-Date: 2017-06-30 11:46+0200\n"
"PO-Revision-Date: 2008-03-02 19:02+0100\n" "PO-Revision-Date: 2008-03-02 19:02+0100\n"
"Last-Translator: Luca Olivetti <luca@ventoso.org>\n" "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
"Language-Team: Catalan <vdr@linuxtv.org>\n" "Language-Team: Catalan <vdr@linuxtv.org>\n"
@ -1301,6 +1301,12 @@ msgstr ""
msgid "Setup.Replay$Resume ID" msgid "Setup.Replay$Resume ID"
msgstr "ID de Continuar" msgstr "ID de Continuar"
msgid "any hosts"
msgstr ""
msgid "only default host"
msgstr ""
msgid "type" msgid "type"
msgstr "" msgstr ""

8
po/cs_CZ.po
View File

@ -10,7 +10,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 2.2.0\n" "Project-Id-Version: VDR 2.2.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2017-06-10 17:19+0200\n" "POT-Creation-Date: 2017-06-30 11:46+0200\n"
"PO-Revision-Date: 2010-05-06 11:00+0200\n" "PO-Revision-Date: 2010-05-06 11:00+0200\n"
"Last-Translator: Aleš Juřík <ajurik@quick.cz>\n" "Last-Translator: Aleš Juřík <ajurik@quick.cz>\n"
"Language-Team: Czech <vdr@linuxtv.org>\n" "Language-Team: Czech <vdr@linuxtv.org>\n"
@ -1301,6 +1301,12 @@ msgstr "Velikost skoku za použití tlačítek Zelená/Žlutá při opakování
msgid "Setup.Replay$Resume ID" msgid "Setup.Replay$Resume ID"
msgstr "ID obnovení" msgstr "ID obnovení"
msgid "any hosts"
msgstr ""
msgid "only default host"
msgstr ""
msgid "type" msgid "type"
msgstr "" msgstr ""

8
po/da_DK.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 2.2.0\n" "Project-Id-Version: VDR 2.2.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2017-06-10 17:19+0200\n" "POT-Creation-Date: 2017-06-30 11:46+0200\n"
"PO-Revision-Date: 2007-08-12 14:17+0200\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n"
"Last-Translator: Mogens Elneff <mogens@elneff.dk>\n" "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
"Language-Team: Danish <vdr@linuxtv.org>\n" "Language-Team: Danish <vdr@linuxtv.org>\n"
@ -1298,6 +1298,12 @@ msgstr ""
msgid "Setup.Replay$Resume ID" msgid "Setup.Replay$Resume ID"
msgstr "Genoptagelses ID" msgstr "Genoptagelses ID"
msgid "any hosts"
msgstr ""
msgid "only default host"
msgstr ""
msgid "type" msgid "type"
msgstr "" msgstr ""

8
po/de_DE.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 2.2.0\n" "Project-Id-Version: VDR 2.2.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2017-06-10 17:19+0200\n" "POT-Creation-Date: 2017-06-30 11:46+0200\n"
"PO-Revision-Date: 2015-02-10 13:45+0100\n" "PO-Revision-Date: 2015-02-10 13:45+0100\n"
"Last-Translator: Klaus Schmidinger <vdr@tvdr.de>\n" "Last-Translator: Klaus Schmidinger <vdr@tvdr.de>\n"
"Language-Team: German <vdr@linuxtv.org>\n" "Language-Team: German <vdr@linuxtv.org>\n"
@ -1299,6 +1299,12 @@ msgstr "Sprungweite mit Taste Gr
msgid "Setup.Replay$Resume ID" msgid "Setup.Replay$Resume ID"
msgstr "Wiedergabe-ID" msgstr "Wiedergabe-ID"
msgid "any hosts"
msgstr "mit jeder Maschine"
msgid "only default host"
msgstr "nur mit der Standardmaschine"
msgid "type" msgid "type"
msgstr "Typ" msgstr "Typ"

8
po/el_GR.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 2.2.0\n" "Project-Id-Version: VDR 2.2.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2017-06-10 17:19+0200\n" "POT-Creation-Date: 2017-06-30 11:46+0200\n"
"PO-Revision-Date: 2007-08-12 14:17+0200\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n"
"Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n" "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
"Language-Team: Greek <vdr@linuxtv.org>\n" "Language-Team: Greek <vdr@linuxtv.org>\n"
@ -1298,6 +1298,12 @@ msgstr ""
msgid "Setup.Replay$Resume ID" msgid "Setup.Replay$Resume ID"
msgstr "ID áíáìåôÜäïóçò" msgstr "ID áíáìåôÜäïóçò"
msgid "any hosts"
msgstr ""
msgid "only default host"
msgstr ""
msgid "type" msgid "type"
msgstr "" msgstr ""

8
po/es_ES.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 2.2.0\n" "Project-Id-Version: VDR 2.2.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2017-06-10 17:19+0200\n" "POT-Creation-Date: 2017-06-30 11:46+0200\n"
"PO-Revision-Date: 2015-02-19 23:00+0100\n" "PO-Revision-Date: 2015-02-19 23:00+0100\n"
"Last-Translator: Gabriel Bonich <gbonich@gmail.com>\n" "Last-Translator: Gabriel Bonich <gbonich@gmail.com>\n"
"Language-Team: Spanish <vdr@linuxtv.org>\n" "Language-Team: Spanish <vdr@linuxtv.org>\n"
@ -1299,6 +1299,12 @@ msgstr "Saltar distancia con teclas verde/amarillo en la repetici
msgid "Setup.Replay$Resume ID" msgid "Setup.Replay$Resume ID"
msgstr "ID de continuación" msgstr "ID de continuación"
msgid "any hosts"
msgstr ""
msgid "only default host"
msgstr ""
msgid "type" msgid "type"
msgstr "" msgstr ""

8
po/et_EE.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 2.2.0\n" "Project-Id-Version: VDR 2.2.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2017-06-10 17:19+0200\n" "POT-Creation-Date: 2017-06-30 11:46+0200\n"
"PO-Revision-Date: 2007-08-12 14:17+0200\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n"
"Last-Translator: Arthur Konovalov <artlov@gmail.com>\n" "Last-Translator: Arthur Konovalov <artlov@gmail.com>\n"
"Language-Team: Estonian <vdr@linuxtv.org>\n" "Language-Team: Estonian <vdr@linuxtv.org>\n"
@ -1298,6 +1298,12 @@ msgstr "Klahvide Roheline/Kollane korduv hüpe (s)"
msgid "Setup.Replay$Resume ID" msgid "Setup.Replay$Resume ID"
msgstr "Taasesituse tunnus" msgstr "Taasesituse tunnus"
msgid "any hosts"
msgstr ""
msgid "only default host"
msgstr ""
msgid "type" msgid "type"
msgstr "" msgstr ""

8
po/fi_FI.po
View File

@ -11,7 +11,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 2.2.0\n" "Project-Id-Version: VDR 2.2.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2017-06-10 17:19+0200\n" "POT-Creation-Date: 2017-06-30 11:46+0200\n"
"PO-Revision-Date: 2007-08-15 15:52+0200\n" "PO-Revision-Date: 2007-08-15 15:52+0200\n"
"Last-Translator: Matti Lehtimäki <matti.lehtimaki@gmail.com>\n" "Last-Translator: Matti Lehtimäki <matti.lehtimaki@gmail.com>\n"
"Language-Team: Finnish <vdr@linuxtv.org>\n" "Language-Team: Finnish <vdr@linuxtv.org>\n"
@ -1302,6 +1302,12 @@ msgstr "Toistohypyn kesto värinäppäimillä (s)"
msgid "Setup.Replay$Resume ID" msgid "Setup.Replay$Resume ID"
msgstr "Tallenteen paluutunniste" msgstr "Tallenteen paluutunniste"
msgid "any hosts"
msgstr ""
msgid "only default host"
msgstr ""
msgid "type" msgid "type"
msgstr "" msgstr ""

8
po/fr_FR.po
View File

@ -18,7 +18,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 2.2.0\n" "Project-Id-Version: VDR 2.2.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2017-06-10 17:19+0200\n" "POT-Creation-Date: 2017-06-30 11:46+0200\n"
"PO-Revision-Date: 2015-02-18 20:16+0100\n" "PO-Revision-Date: 2015-02-18 20:16+0100\n"
"Last-Translator: Bernard Jaulin <bernard.jaulin@gmail.com>\n" "Last-Translator: Bernard Jaulin <bernard.jaulin@gmail.com>\n"
"Language-Team: French <vdr@linuxtv.org>\n" "Language-Team: French <vdr@linuxtv.org>\n"
@ -1309,6 +1309,12 @@ msgstr "Durée du saut pour les touches Verte/Jaune en répétition (s)"
msgid "Setup.Replay$Resume ID" msgid "Setup.Replay$Resume ID"
msgstr "ID résumé" msgstr "ID résumé"
msgid "any hosts"
msgstr ""
msgid "only default host"
msgstr ""
msgid "type" msgid "type"
msgstr "" msgstr ""

8
po/hr_HR.po
View File

@ -9,7 +9,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 2.2.0\n" "Project-Id-Version: VDR 2.2.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2017-06-10 17:19+0200\n" "POT-Creation-Date: 2017-06-30 11:46+0200\n"
"PO-Revision-Date: 2008-03-17 19:00+0100\n" "PO-Revision-Date: 2008-03-17 19:00+0100\n"
"Last-Translator: Adrian Caval <anrxc@sysphere.org>\n" "Last-Translator: Adrian Caval <anrxc@sysphere.org>\n"
"Language-Team: Croatian <vdr@linuxtv.org>\n" "Language-Team: Croatian <vdr@linuxtv.org>\n"
@ -1300,6 +1300,12 @@ msgstr ""
msgid "Setup.Replay$Resume ID" msgid "Setup.Replay$Resume ID"
msgstr "ID nastavka" msgstr "ID nastavka"
msgid "any hosts"
msgstr ""
msgid "only default host"
msgstr ""
msgid "type" msgid "type"
msgstr "" msgstr ""

8
po/hu_HU.po
View File

@ -11,7 +11,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 2.2.0\n" "Project-Id-Version: VDR 2.2.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2017-06-10 17:19+0200\n" "POT-Creation-Date: 2017-06-30 11:46+0200\n"
"PO-Revision-Date: 2015-02-13 09:36+0200\n" "PO-Revision-Date: 2015-02-13 09:36+0200\n"
"Last-Translator: István Füley <ifuley@tigercomp.ro>\n" "Last-Translator: István Füley <ifuley@tigercomp.ro>\n"
"Language-Team: Hungarian <vdr@linuxtv.org>\n" "Language-Team: Hungarian <vdr@linuxtv.org>\n"
@ -1303,6 +1303,12 @@ msgstr "Ismételt ugrástáv a Zöld/Sárga gombokkal (mp)"
msgid "Setup.Replay$Resume ID" msgid "Setup.Replay$Resume ID"
msgstr "Lejátszás azonosító" msgstr "Lejátszás azonosító"
msgid "any hosts"
msgstr ""
msgid "only default host"
msgstr ""
msgid "type" msgid "type"
msgstr "" msgstr ""

8
po/it_IT.po
View File

@ -11,7 +11,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 2.2.0\n" "Project-Id-Version: VDR 2.2.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2017-06-10 17:19+0200\n" "POT-Creation-Date: 2017-06-30 11:46+0200\n"
"PO-Revision-Date: 2017-06-23 00:00+0100\n" "PO-Revision-Date: 2017-06-23 00:00+0100\n"
"Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n" "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
"Language-Team: Italian <vdr@linuxtv.org>\n" "Language-Team: Italian <vdr@linuxtv.org>\n"
@ -1304,6 +1304,12 @@ msgstr "Durata spostamento con tasti Verde/Giallo in sequenza (s)"
msgid "Setup.Replay$Resume ID" msgid "Setup.Replay$Resume ID"
msgstr "ID di ripristino" msgstr "ID di ripristino"
msgid "any hosts"
msgstr ""
msgid "only default host"
msgstr ""
msgid "type" msgid "type"
msgstr "tipo" msgstr "tipo"

8
po/lt_LT.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 2.2.0\n" "Project-Id-Version: VDR 2.2.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2017-06-10 17:19+0200\n" "POT-Creation-Date: 2017-06-30 11:46+0200\n"
"PO-Revision-Date: 2015-02-11 14:02+0200\n" "PO-Revision-Date: 2015-02-11 14:02+0200\n"
"Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n" "Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n"
"Language-Team: Lithuanian <vdr@linuxtv.org>\n" "Language-Team: Lithuanian <vdr@linuxtv.org>\n"
@ -1298,6 +1298,12 @@ msgstr "Praleisti atkarpą pakartojime (s) su Žaliu/Geltonu mygtukais"
msgid "Setup.Replay$Resume ID" msgid "Setup.Replay$Resume ID"
msgstr "Kūrinio ID" msgstr "Kūrinio ID"
msgid "any hosts"
msgstr ""
msgid "only default host"
msgstr ""
msgid "type" msgid "type"
msgstr "" msgstr ""

8
po/mk_MK.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 2.2.0\n" "Project-Id-Version: VDR 2.2.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2017-06-10 17:19+0200\n" "POT-Creation-Date: 2017-06-30 11:46+0200\n"
"PO-Revision-Date: 2015-02-08 15:18+0100\n" "PO-Revision-Date: 2015-02-08 15:18+0100\n"
"Last-Translator: Dimitar Petrovski <dimeptr@gmail.com>\n" "Last-Translator: Dimitar Petrovski <dimeptr@gmail.com>\n"
"Language-Team: Macedonian <en@li.org>\n" "Language-Team: Macedonian <en@li.org>\n"
@ -1299,6 +1299,12 @@ msgstr "Дистанца на скокање со Зелено/Жолто коп
msgid "Setup.Replay$Resume ID" msgid "Setup.Replay$Resume ID"
msgstr "ID на продолжеток" msgstr "ID на продолжеток"
msgid "any hosts"
msgstr ""
msgid "only default host"
msgstr ""
msgid "type" msgid "type"
msgstr "" msgstr ""

8
po/nl_NL.po
View File

@ -13,7 +13,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 2.2.0\n" "Project-Id-Version: VDR 2.2.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2017-06-10 17:19+0200\n" "POT-Creation-Date: 2017-06-30 11:46+0200\n"
"PO-Revision-Date: 2015-02-10 19:43+0100\n" "PO-Revision-Date: 2015-02-10 19:43+0100\n"
"Last-Translator: Erik Oomen <oomen.e@gmail.com>\n" "Last-Translator: Erik Oomen <oomen.e@gmail.com>\n"
"Language-Team: Dutch <vdr@linuxtv.org>\n" "Language-Team: Dutch <vdr@linuxtv.org>\n"
@ -1304,6 +1304,12 @@ msgstr "Spoel sprong met groene en gele toesten in repeteerstand (s)"
msgid "Setup.Replay$Resume ID" msgid "Setup.Replay$Resume ID"
msgstr "Hervattings ID" msgstr "Hervattings ID"
msgid "any hosts"
msgstr ""
msgid "only default host"
msgstr ""
msgid "type" msgid "type"
msgstr "" msgstr ""

8
po/nn_NO.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 2.2.0\n" "Project-Id-Version: VDR 2.2.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2017-06-10 17:19+0200\n" "POT-Creation-Date: 2017-06-30 11:46+0200\n"
"PO-Revision-Date: 2007-08-12 14:17+0200\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n"
"Last-Translator: Truls Slevigen <truls@slevigen.no>\n" "Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
"Language-Team: Norwegian Nynorsk <vdr@linuxtv.org>\n" "Language-Team: Norwegian Nynorsk <vdr@linuxtv.org>\n"
@ -1299,6 +1299,12 @@ msgstr ""
msgid "Setup.Replay$Resume ID" msgid "Setup.Replay$Resume ID"
msgstr "Resume ID" msgstr "Resume ID"
msgid "any hosts"
msgstr ""
msgid "only default host"
msgstr ""
msgid "type" msgid "type"
msgstr "" msgstr ""

8
po/pl_PL.po
View File

@ -10,7 +10,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 2.2.0\n" "Project-Id-Version: VDR 2.2.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2017-06-10 17:19+0200\n" "POT-Creation-Date: 2017-06-30 11:46+0200\n"
"PO-Revision-Date: 2015-02-12 00:59+0100\n" "PO-Revision-Date: 2015-02-12 00:59+0100\n"
"Last-Translator: Tomasz Maciej Nowak <tmn505@gmail.com>\n" "Last-Translator: Tomasz Maciej Nowak <tmn505@gmail.com>\n"
"Language-Team: Polish <vdr@linuxtv.org>\n" "Language-Team: Polish <vdr@linuxtv.org>\n"
@ -1301,6 +1301,12 @@ msgstr "Pomi
msgid "Setup.Replay$Resume ID" msgid "Setup.Replay$Resume ID"
msgstr "ID wznowienia" msgstr "ID wznowienia"
msgid "any hosts"
msgstr ""
msgid "only default host"
msgstr ""
msgid "type" msgid "type"
msgstr "" msgstr ""

8
po/pt_PT.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 2.2.0\n" "Project-Id-Version: VDR 2.2.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2017-06-10 17:19+0200\n" "POT-Creation-Date: 2017-06-30 11:46+0200\n"
"PO-Revision-Date: 2010-03-28 22:49+0100\n" "PO-Revision-Date: 2010-03-28 22:49+0100\n"
"Last-Translator: Cris Silva <hudokkow@gmail.com>\n" "Last-Translator: Cris Silva <hudokkow@gmail.com>\n"
"Language-Team: Portuguese <vdr@linuxtv.org>\n" "Language-Team: Portuguese <vdr@linuxtv.org>\n"
@ -1299,6 +1299,12 @@ msgstr ""
msgid "Setup.Replay$Resume ID" msgid "Setup.Replay$Resume ID"
msgstr "ID de resumo" msgstr "ID de resumo"
msgid "any hosts"
msgstr ""
msgid "only default host"
msgstr ""
msgid "type" msgid "type"
msgstr "" msgstr ""

8
po/ro_RO.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 2.2.0\n" "Project-Id-Version: VDR 2.2.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2017-06-10 17:19+0200\n" "POT-Creation-Date: 2017-06-30 11:46+0200\n"
"PO-Revision-Date: 2015-02-11 22:26+0100\n" "PO-Revision-Date: 2015-02-11 22:26+0100\n"
"Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n" "Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
"Language-Team: Romanian <vdr@linuxtv.org>\n" "Language-Team: Romanian <vdr@linuxtv.org>\n"
@ -1300,6 +1300,12 @@ msgstr "Durata sărită cu tastele Verde/Galben la repetiție (s)"
msgid "Setup.Replay$Resume ID" msgid "Setup.Replay$Resume ID"
msgstr "Identificator continuare" msgstr "Identificator continuare"
msgid "any hosts"
msgstr ""
msgid "only default host"
msgstr ""
msgid "type" msgid "type"
msgstr "" msgstr ""

8
po/ru_RU.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 2.2.0\n" "Project-Id-Version: VDR 2.2.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2017-06-10 17:19+0200\n" "POT-Creation-Date: 2017-06-30 11:46+0200\n"
"PO-Revision-Date: 2016-12-27 17:13+0100\n" "PO-Revision-Date: 2016-12-27 17:13+0100\n"
"Last-Translator: Pridvorov Andrey <ua0lnj@bk.ru>\n" "Last-Translator: Pridvorov Andrey <ua0lnj@bk.ru>\n"
"Language-Team: Russian <vdr@linuxtv.org>\n" "Language-Team: Russian <vdr@linuxtv.org>\n"
@ -1299,6 +1299,12 @@ msgstr "Пропуск интервала Зелёный/Жёлтый в пов
msgid "Setup.Replay$Resume ID" msgid "Setup.Replay$Resume ID"
msgstr "ID воспроизведения" msgstr "ID воспроизведения"
msgid "any hosts"
msgstr ""
msgid "only default host"
msgstr ""
msgid "type" msgid "type"
msgstr "" msgstr ""

8
po/sk_SK.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 2.2.0\n" "Project-Id-Version: VDR 2.2.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2017-06-10 17:19+0200\n" "POT-Creation-Date: 2017-06-30 11:46+0200\n"
"PO-Revision-Date: 2015-02-17 18:59+0100\n" "PO-Revision-Date: 2015-02-17 18:59+0100\n"
"Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n" "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
"Language-Team: Slovak <vdr@linuxtv.org>\n" "Language-Team: Slovak <vdr@linuxtv.org>\n"
@ -1299,6 +1299,12 @@ msgstr "Opakovan
msgid "Setup.Replay$Resume ID" msgid "Setup.Replay$Resume ID"
msgstr "ident. èíslo obnovenia prehrávania" msgstr "ident. èíslo obnovenia prehrávania"
msgid "any hosts"
msgstr ""
msgid "only default host"
msgstr ""
msgid "type" msgid "type"
msgstr "" msgstr ""

8
po/sl_SI.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 2.2.0\n" "Project-Id-Version: VDR 2.2.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2017-06-10 17:19+0200\n" "POT-Creation-Date: 2017-06-30 11:46+0200\n"
"PO-Revision-Date: 2013-03-04 12:46+0100\n" "PO-Revision-Date: 2013-03-04 12:46+0100\n"
"Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n" "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
"Language-Team: Slovenian <vdr@linuxtv.org>\n" "Language-Team: Slovenian <vdr@linuxtv.org>\n"
@ -1299,6 +1299,12 @@ msgstr ""
msgid "Setup.Replay$Resume ID" msgid "Setup.Replay$Resume ID"
msgstr "ID za predvajanje" msgstr "ID za predvajanje"
msgid "any hosts"
msgstr ""
msgid "only default host"
msgstr ""
msgid "type" msgid "type"
msgstr "" msgstr ""

8
po/sr_RS.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 2.2.0\n" "Project-Id-Version: VDR 2.2.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2017-06-10 17:19+0200\n" "POT-Creation-Date: 2017-06-30 11:46+0200\n"
"PO-Revision-Date: 2013-03-16 15:05+0100\n" "PO-Revision-Date: 2013-03-16 15:05+0100\n"
"Last-Translator: Zoran Turalija <zoran.turalija@gmail.com>\n" "Last-Translator: Zoran Turalija <zoran.turalija@gmail.com>\n"
"Language-Team: Serbian <vdr@linuxtv.org>\n" "Language-Team: Serbian <vdr@linuxtv.org>\n"
@ -1299,6 +1299,12 @@ msgstr ""
msgid "Setup.Replay$Resume ID" msgid "Setup.Replay$Resume ID"
msgstr "ID reprodukcije" msgstr "ID reprodukcije"
msgid "any hosts"
msgstr ""
msgid "only default host"
msgstr ""
msgid "type" msgid "type"
msgstr "" msgstr ""

8
po/sv_SE.po
View File

@ -12,7 +12,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 2.2.0\n" "Project-Id-Version: VDR 2.2.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2017-06-10 17:19+0200\n" "POT-Creation-Date: 2017-06-30 11:46+0200\n"
"PO-Revision-Date: 2015-02-12 21:58+0100\n" "PO-Revision-Date: 2015-02-12 21:58+0100\n"
"Last-Translator: Magnus Sirviö <sirwio@hotmail.com>\n" "Last-Translator: Magnus Sirviö <sirwio@hotmail.com>\n"
"Language-Team: Swedish <vdr@linuxtv.org>\n" "Language-Team: Swedish <vdr@linuxtv.org>\n"
@ -1303,6 +1303,12 @@ msgstr "Tid f
msgid "Setup.Replay$Resume ID" msgid "Setup.Replay$Resume ID"
msgstr "Återupptagnings-ID" msgstr "Återupptagnings-ID"
msgid "any hosts"
msgstr ""
msgid "only default host"
msgstr ""
msgid "type" msgid "type"
msgstr "" msgstr ""

8
po/tr_TR.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 2.2.0\n" "Project-Id-Version: VDR 2.2.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2017-06-10 17:19+0200\n" "POT-Creation-Date: 2017-06-30 11:46+0200\n"
"PO-Revision-Date: 2008-02-28 00:33+0100\n" "PO-Revision-Date: 2008-02-28 00:33+0100\n"
"Last-Translator: Oktay Yolgeçen <oktay_73@yahoo.de>\n" "Last-Translator: Oktay Yolgeçen <oktay_73@yahoo.de>\n"
"Language-Team: Turkish <vdr@linuxtv.org>\n" "Language-Team: Turkish <vdr@linuxtv.org>\n"
@ -1298,6 +1298,12 @@ msgstr ""
msgid "Setup.Replay$Resume ID" msgid "Setup.Replay$Resume ID"
msgstr "Gösteriþ ID'si" msgstr "Gösteriþ ID'si"
msgid "any hosts"
msgstr ""
msgid "only default host"
msgstr ""
msgid "type" msgid "type"
msgstr "" msgstr ""

8
po/uk_UA.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 2.2.0\n" "Project-Id-Version: VDR 2.2.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2017-06-10 17:19+0200\n" "POT-Creation-Date: 2017-06-30 11:46+0200\n"
"PO-Revision-Date: 2015-02-13 18:14+0100\n" "PO-Revision-Date: 2015-02-13 18:14+0100\n"
"Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n" "Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n"
"Language-Team: Ukrainian <vdr@linuxtv.org>\n" "Language-Team: Ukrainian <vdr@linuxtv.org>\n"
@ -1299,6 +1299,12 @@ msgstr "Інтервал пропуску з Зеленою/Жовтою кно
msgid "Setup.Replay$Resume ID" msgid "Setup.Replay$Resume ID"
msgstr "ID продовження" msgstr "ID продовження"
msgid "any hosts"
msgstr ""
msgid "only default host"
msgstr ""
msgid "type" msgid "type"
msgstr "" msgstr ""

8
po/zh_CN.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 2.2.0\n" "Project-Id-Version: VDR 2.2.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2017-06-10 17:19+0200\n" "POT-Creation-Date: 2017-06-30 11:46+0200\n"
"PO-Revision-Date: 2013-03-04 14:52+0800\n" "PO-Revision-Date: 2013-03-04 14:52+0800\n"
"Last-Translator: NFVDR <nfvdr@live.com>\n" "Last-Translator: NFVDR <nfvdr@live.com>\n"
"Language-Team: Chinese (simplified) <nfvdr@live.com>\n" "Language-Team: Chinese (simplified) <nfvdr@live.com>\n"
@ -1300,6 +1300,12 @@ msgstr ""
msgid "Setup.Replay$Resume ID" msgid "Setup.Replay$Resume ID"
msgstr "恢复 ID" msgstr "恢复 ID"
msgid "any hosts"
msgstr ""
msgid "only default host"
msgstr ""
msgid "type" msgid "type"
msgstr "" msgstr ""

9
svdrp.c
View File

@ -10,7 +10,7 @@
* and interact with the Video Disk Recorder - or write a full featured * and interact with the Video Disk Recorder - or write a full featured
* graphical interface that sits on top of an SVDRP connection. * graphical interface that sits on top of an SVDRP connection.
* *
* $Id: svdrp.c 4.21 2017/06/25 12:31:13 kls Exp $ * $Id: svdrp.c 4.22 2017/06/30 09:49:39 kls Exp $
*/ */
#include "svdrp.h" #include "svdrp.h"
@ -549,7 +549,7 @@ cSVDRPClient *cSVDRPClientHandler::GetClientForServer(const char *ServerName)
void cSVDRPClientHandler::SendDiscover(const char *Address) void cSVDRPClientHandler::SendDiscover(const char *Address)
{ {
cMutexLock MutexLock(&mutex); cMutexLock MutexLock(&mutex);
cString Dgram = cString::sprintf("SVDRP:discover name:%s port:%d vdrversion:%d apiversion:%d timeout:%d", Setup.SVDRPHostName, tcpPort, VDRVERSNUM, APIVERSNUM, Setup.SVDRPTimeout); cString Dgram = cString::sprintf("SVDRP:discover name:%s port:%d vdrversion:%d apiversion:%d timeout:%d%s", Setup.SVDRPHostName, tcpPort, VDRVERSNUM, APIVERSNUM, Setup.SVDRPTimeout, (Setup.SVDRPPeering == spmOnly && *Setup.SVDRPDefaultHost) ? *cString::sprintf(" host:%s", Setup.SVDRPDefaultHost) : "");
udpSocket.SendDgram(Dgram, udpSocket.Port(), Address); udpSocket.SendDgram(Dgram, udpSocket.Port(), Address);
} }
@ -580,6 +580,11 @@ void cSVDRPClientHandler::HandleClientConnection(void)
} }
cString ServerName = strgetval(NewDiscover, "name", ':'); cString ServerName = strgetval(NewDiscover, "name", ':');
if (*ServerName) { if (*ServerName) {
if (Setup.SVDRPPeering == spmOnly && strcmp(ServerName, Setup.SVDRPDefaultHost) != 0)
return; // we only want to peer with the default host, but this isn't the default host
cString HostName = strgetval(NewDiscover, "host", ':');
if (*HostName && strcmp(HostName, Setup.SVDRPHostName) != 0)
return; // the remote VDR requests a specific host, but it's not us
cString t = strgetval(NewDiscover, "timeout", ':'); cString t = strgetval(NewDiscover, "timeout", ':');
if (*t) { if (*t) {
int Timeout = atoi(t); int Timeout = atoi(t);

8
svdrp.h
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: svdrp.h 4.6 2017/06/25 12:27:57 kls Exp $ * $Id: svdrp.h 4.7 2017/06/30 09:49:39 kls Exp $
*/ */
#ifndef __SVDRP_H #ifndef __SVDRP_H
@ -12,6 +12,12 @@
#include "tools.h" #include "tools.h"
enum eSvdrpPeerModes {
spmOff = 0,
spmAny = 1,
spmOnly = 2,
};
enum eSvdrpFetchFlags { enum eSvdrpFetchFlags {
sffNone = 0b0000, sffNone = 0b0000,
sffTimers = 0b0001, sffTimers = 0b0001,