diff --git a/CONTRIBUTORS b/CONTRIBUTORS index d85b2390..cb990fcd 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1187,6 +1187,7 @@ Rolf Ahrenberg for fixing clearing non-editable members in the channel editor for reporting a problem with adding new source types in case they are already registered + for adding support for "Pilot", "T2-System-Id" and "SISO/MISO" parameters Ralf Klueber for reporting a bug in cutting a recording if there is only a single editing mark diff --git a/HISTORY b/HISTORY index 800a6fd0..f701a0d5 100644 --- a/HISTORY +++ b/HISTORY @@ -8203,7 +8203,7 @@ Video Disk Recorder Revision History - Fixed detecting broken video data streams when recording. - Fixed handling frame detection buffer length (reported by Eike Sauer). -2014-03-11: Version 2.1.6 +2014-03-16: Version 2.1.6 - Revoked "Fixed some compiler warnings with Clang 3.4.1" from ci.c, because this did not compile with older versions of gcc (thanks to Sren Moch). @@ -8250,3 +8250,5 @@ Video Disk Recorder Revision History original "full featured" DVB cards - do not use it for new developments! If an output device has several ways of replaying audio (like HDMI or analog jack) it shall implement the proper options in its plugin's SetupMenu() function. +- Added support for "Pilot", "T2-System-Id" and "SISO/MISO" parameters (thanks to + Rolf Ahrenberg). diff --git a/dvbdevice.c b/dvbdevice.c index 6d1c9562..fb406f1a 100644 --- a/dvbdevice.c +++ b/dvbdevice.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: dvbdevice.c 3.10 2014/01/20 11:46:26 kls Exp $ + * $Id: dvbdevice.c 3.11 2014/03/16 10:38:31 kls Exp $ */ #include "dvbdevice.h" @@ -36,6 +36,13 @@ static int DvbApiVersion = 0x0000; // the version of the DVB driver actually in // --- DVB Parameter Maps ---------------------------------------------------- +const tDvbParameterMap PilotValues[] = { + { 0, PILOT_OFF, trNOOP("off") }, + { 1, PILOT_ON, trNOOP("on") }, + { 999, PILOT_AUTO, trNOOP("auto") }, + { -1, 0, NULL } + }; + const tDvbParameterMap InversionValues[] = { { 0, INVERSION_OFF, trNOOP("off") }, { 1, INVERSION_ON, trNOOP("on") }, @@ -206,6 +213,9 @@ cDvbTransponderParameters::cDvbTransponderParameters(const char *Parameters) hierarchy = HIERARCHY_AUTO; rollOff = ROLLOFF_AUTO; streamId = 0; + t2systemId = 0; + sisoMiso = 0; + pilot = PILOT_AUTO; Parse(Parameters); } @@ -227,10 +237,13 @@ cString cDvbTransponderParameters::ToString(char Type) const ST(" T*") q += PrintParameter(q, 'G', MapToUser(guard, GuardValues)); ST("ACST*") q += PrintParameter(q, 'I', MapToUser(inversion, InversionValues)); ST("ACST*") q += PrintParameter(q, 'M', MapToUser(modulation, ModulationValues)); + ST(" S 2") q += PrintParameter(q, 'N', MapToUser(pilot, PilotValues)); ST(" S 2") q += PrintParameter(q, 'O', MapToUser(rollOff, RollOffValues)); ST(" ST2") q += PrintParameter(q, 'P', streamId); + ST(" T2") q += PrintParameter(q, 'Q', t2systemId); ST(" ST*") q += PrintParameter(q, 'S', MapToUser(system, SystemValuesSat)); // we only need the numerical value, so Sat or Terr doesn't matter ST(" T*") q += PrintParameter(q, 'T', MapToUser(transmission, TransmissionValues)); + ST(" T2") q += PrintParameter(q, 'X', sisoMiso); ST(" T*") q += PrintParameter(q, 'Y', MapToUser(hierarchy, HierarchyValues)); return buffer; } @@ -263,12 +276,15 @@ bool cDvbTransponderParameters::Parse(const char *s) case 'I': s = ParseParameter(s, inversion, InversionValues); break; case 'L': polarization = 'L'; s++; break; case 'M': s = ParseParameter(s, modulation, ModulationValues); break; + case 'N': s = ParseParameter(s, pilot, PilotValues); break; case 'O': s = ParseParameter(s, rollOff, RollOffValues); break; case 'P': s = ParseParameter(s, streamId); break; + case 'Q': s = ParseParameter(s, t2systemId); break; case 'R': polarization = 'R'; s++; break; case 'S': s = ParseParameter(s, system, SystemValuesSat); break; // we only need the numerical value, so Sat or Terr doesn't matter case 'T': s = ParseParameter(s, transmission, TransmissionValues); break; case 'V': polarization = 'V'; s++; break; + case 'X': s = ParseParameter(s, sisoMiso); break; case 'Y': s = ParseParameter(s, hierarchy, HierarchyValues); break; default: esyslog("ERROR: unknown parameter key '%c'", *s); return false; @@ -839,7 +855,7 @@ bool cDvbTuner::SetFrontend(void) SETCMD(DTV_INVERSION, dtp.Inversion()); if (frontendType == SYS_DVBS2) { // DVB-S2 - SETCMD(DTV_PILOT, PILOT_AUTO); + SETCMD(DTV_PILOT, dtp.Pilot()); SETCMD(DTV_ROLLOFF, dtp.RollOff()); if (DvbApiVersion >= 0x0508) SETCMD(DTV_STREAM_ID, dtp.StreamId()); @@ -1038,6 +1054,9 @@ cOsdItem *cDvbSourceParam::GetOsdItem(void) case 10: ST(" T") return new cMenuEditMapItem( tr("Hierarchy"), &dtp.hierarchy, HierarchyValues); else return GetOsdItem(); case 11: ST(" S ") return new cMenuEditMapItem( tr("Rolloff"), &dtp.rollOff, RollOffValues); else return GetOsdItem(); case 12: ST(" ST") return new cMenuEditIntItem( tr("StreamId"), &dtp.streamId, 0, 255); else return GetOsdItem(); + case 13: ST(" S ") return new cMenuEditMapItem( tr("Pilot"), &dtp.pilot, PilotValues); else return GetOsdItem(); + case 14: ST(" T") return new cMenuEditIntItem( tr("T2SystemId"), &dtp.t2systemId, 0, 65535); else return GetOsdItem(); + case 15: ST(" T") return new cMenuEditIntItem( tr("SISO/MISO"), &dtp.sisoMiso, 0, 1); else return GetOsdItem(); default: return NULL; } return NULL; diff --git a/dvbdevice.h b/dvbdevice.h index 278edd0c..0a148ce3 100644 --- a/dvbdevice.h +++ b/dvbdevice.h @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: dvbdevice.h 3.4 2014/01/16 11:45:35 kls Exp $ + * $Id: dvbdevice.h 3.5 2014/03/16 10:38:31 kls Exp $ */ #ifndef __DVBDEVICE_H @@ -92,6 +92,7 @@ int MapToDriver(int Value, const tDvbParameterMap *Map); int UserIndex(int Value, const tDvbParameterMap *Map); int DriverIndex(int Value, const tDvbParameterMap *Map); +extern const tDvbParameterMap PilotValues[]; extern const tDvbParameterMap InversionValues[]; extern const tDvbParameterMap BandwidthValues[]; extern const tDvbParameterMap CoderateValues[]; @@ -118,6 +119,9 @@ private: int hierarchy; int rollOff; int streamId; + int t2systemId; + int sisoMiso; + int pilot; int PrintParameter(char *p, char Name, int Value) const; const char *ParseParameter(const char *s, int &Value, const tDvbParameterMap *Map = NULL); public: @@ -134,6 +138,9 @@ public: int Hierarchy(void) const { return hierarchy; } int RollOff(void) const { return rollOff; } int StreamId(void) const { return streamId; } + int T2SystemId(void) const { return t2systemId; } + int SisoMiso(void) const { return sisoMiso; } + int Pilot(void) const { return pilot; } void SetPolarization(char Polarization) { polarization = Polarization; } void SetInversion(int Inversion) { inversion = Inversion; } void SetBandwidth(int Bandwidth) { bandwidth = Bandwidth; } @@ -146,6 +153,9 @@ public: void SetHierarchy(int Hierarchy) { hierarchy = Hierarchy; } void SetRollOff(int RollOff) { rollOff = RollOff; } void SetStreamId(int StreamId) { streamId = StreamId; } + void SetT2SystemId(int T2SystemId) { t2systemId = T2SystemId; } + void SetSisoMiso(int SisoMiso) { sisoMiso = SisoMiso; } + void SetPilot(int Pilot) { pilot = Pilot; } cString ToString(char Type) const; bool Parse(const char *s); }; diff --git a/menu.c b/menu.c index 7a9e16b6..59b11d03 100644 --- a/menu.c +++ b/menu.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: menu.c 3.22 2014/03/09 15:01:31 kls Exp $ + * $Id: menu.c 3.23 2014/03/16 10:38:31 kls Exp $ */ #include "menu.h" @@ -214,9 +214,9 @@ void cMenuEditChannel::Setup(void) Add(new cMenuEditIntItem( tr("Tpid"), &data.tpid, 0, 0x1FFF)); Add(new cMenuEditCaItem( tr("CA"), &data.caids[0])); Add(new cMenuEditIntItem( tr("Sid"), &data.sid, 1, 0xFFFF)); - /* XXX not yet used Add(new cMenuEditIntItem( tr("Nid"), &data.nid, 0)); Add(new cMenuEditIntItem( tr("Tid"), &data.tid, 0)); + /* XXX not yet used Add(new cMenuEditIntItem( tr("Rid"), &data.rid, 0)); XXX*/ // Parameters for specific types of sources: diff --git a/nit.c b/nit.c index 9bd69587..f3fe9231 100644 --- a/nit.c +++ b/nit.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: nit.c 3.2 2014/03/10 14:35:31 kls Exp $ + * $Id: nit.c 3.3 2014/03/16 10:38:31 kls Exp $ */ #include "nit.h" @@ -333,11 +333,12 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length SI::T2DeliverySystemDescriptor *td = (SI::T2DeliverySystemDescriptor *)d; int Frequency = Channel->Frequency(); int SymbolRate = Channel->Srate(); - //int SystemId = td->getSystemId(); cDvbTransponderParameters dtp(Channel->Parameters()); dtp.SetSystem(DVB_SYSTEM_2); dtp.SetStreamId(td->getPlpId()); + dtp.SetT2SystemId(td->getT2SystemId()); if (td->getExtendedDataFlag()) { + dtp.SetSisoMiso(td->getSisoMiso()); static int T2Bandwidths[] = { 8000000, 7000000, 6000000, 5000000, 10000000, 1712000, 0, 0 }; dtp.SetBandwidth(T2Bandwidths[td->getBandwidth()]); static int T2GuardIntervals[] = { GUARD_INTERVAL_1_32, GUARD_INTERVAL_1_16, GUARD_INTERVAL_1_8, GUARD_INTERVAL_1_4, GUARD_INTERVAL_1_128, GUARD_INTERVAL_19_128, GUARD_INTERVAL_19_256, 0 }; diff --git a/po/ar.po b/po/ar.po index cedfac3e..ef9982be 100644 --- a/po/ar.po +++ b/po/ar.po @@ -80,6 +80,15 @@ msgstr "Rolloff" msgid "StreamId" msgstr "StreamId" +msgid "Pilot" +msgstr "" + +msgid "T2SystemId" +msgstr "" + +msgid "SISO/MISO" +msgstr "" + msgid "Starting EPG scan" msgstr "EPG ا لبدء بالبحث على دليل القنوات الالكترونى " @@ -567,6 +576,12 @@ msgstr "الكامة" msgid "Sid" msgstr "Sid" +msgid "Nid" +msgstr "" + +msgid "Tid" +msgstr "" + msgid "Channel settings are not unique!" msgstr "اعدادات القناة غبر موحد" diff --git a/po/ca_ES.po b/po/ca_ES.po index 6329714f..3f2105ff 100644 --- a/po/ca_ES.po +++ b/po/ca_ES.po @@ -79,6 +79,15 @@ msgstr "Rolloff" msgid "StreamId" msgstr "StreamId" +msgid "Pilot" +msgstr "" + +msgid "T2SystemId" +msgstr "" + +msgid "SISO/MISO" +msgstr "" + msgid "Starting EPG scan" msgstr "Iniciant exploraci EPG" @@ -566,6 +575,12 @@ msgstr "Acc msgid "Sid" msgstr "Sid" +msgid "Nid" +msgstr "" + +msgid "Tid" +msgstr "" + msgid "Channel settings are not unique!" msgstr "Propietats del canal duplicades!" diff --git a/po/cs_CZ.po b/po/cs_CZ.po index 7f857d5e..f6ce5727 100644 --- a/po/cs_CZ.po +++ b/po/cs_CZ.po @@ -79,6 +79,15 @@ msgstr "RollOff" msgid "StreamId" msgstr "StreamId" +msgid "Pilot" +msgstr "" + +msgid "T2SystemId" +msgstr "" + +msgid "SISO/MISO" +msgstr "" + msgid "Starting EPG scan" msgstr "Začíná prohledávání EPG" @@ -566,6 +575,12 @@ msgstr "CA" msgid "Sid" msgstr "Sid" +msgid "Nid" +msgstr "" + +msgid "Tid" +msgstr "" + msgid "Channel settings are not unique!" msgstr "Nastavení kanálu není jedinečné!" diff --git a/po/da_DK.po b/po/da_DK.po index c8734bdd..7a4ea8f9 100644 --- a/po/da_DK.po +++ b/po/da_DK.po @@ -76,6 +76,15 @@ msgstr "" msgid "StreamId" msgstr "" +msgid "Pilot" +msgstr "" + +msgid "T2SystemId" +msgstr "" + +msgid "SISO/MISO" +msgstr "" + msgid "Starting EPG scan" msgstr "Starter EPG skanning" @@ -563,6 +572,12 @@ msgstr "CA" msgid "Sid" msgstr "Sid" +msgid "Nid" +msgstr "" + +msgid "Tid" +msgstr "" + msgid "Channel settings are not unique!" msgstr "Kanalindstillinger er ikke entydige!" diff --git a/po/de_DE.po b/po/de_DE.po index 7d69ce05..731f8f26 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -76,6 +76,15 @@ msgstr "Rolloff" msgid "StreamId" msgstr "StreamId" +msgid "Pilot" +msgstr "Pilot" + +msgid "T2SystemId" +msgstr "T2-Systemkennung" + +msgid "SISO/MISO" +msgstr "SISO/MISO" + msgid "Starting EPG scan" msgstr "Aktualisiere EPG-Daten" @@ -563,6 +572,12 @@ msgstr "CA" msgid "Sid" msgstr "Sid" +msgid "Nid" +msgstr "Nid" + +msgid "Tid" +msgstr "Tid" + msgid "Channel settings are not unique!" msgstr "Kanaleinstellungen sind nicht eindeutig!" diff --git a/po/el_GR.po b/po/el_GR.po index ca0701a8..9c10cfef 100644 --- a/po/el_GR.po +++ b/po/el_GR.po @@ -76,6 +76,15 @@ msgstr "" msgid "StreamId" msgstr "" +msgid "Pilot" +msgstr "" + +msgid "T2SystemId" +msgstr "" + +msgid "SISO/MISO" +msgstr "" + msgid "Starting EPG scan" msgstr " EPG" @@ -563,6 +572,12 @@ msgstr "CA" msgid "Sid" msgstr "Sid" +msgid "Nid" +msgstr "" + +msgid "Tid" +msgstr "" + msgid "Channel settings are not unique!" msgstr " !" diff --git a/po/es_ES.po b/po/es_ES.po index d27dd6ea..fc95313e 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -77,6 +77,15 @@ msgstr "Rolloff" msgid "StreamId" msgstr "StreamId" +msgid "Pilot" +msgstr "" + +msgid "T2SystemId" +msgstr "" + +msgid "SISO/MISO" +msgstr "" + msgid "Starting EPG scan" msgstr "Iniciando la exploracin de EPG" @@ -564,6 +573,12 @@ msgstr "Acceso condicional (CA)" msgid "Sid" msgstr "Sid" +msgid "Nid" +msgstr "" + +msgid "Tid" +msgstr "" + msgid "Channel settings are not unique!" msgstr "!Propiedades de canal duplicadas!" diff --git a/po/et_EE.po b/po/et_EE.po index e48bfa1f..7c7cc1ea 100644 --- a/po/et_EE.po +++ b/po/et_EE.po @@ -76,6 +76,15 @@ msgstr "Rolloff" msgid "StreamId" msgstr "Stream-tunnus" +msgid "Pilot" +msgstr "" + +msgid "T2SystemId" +msgstr "" + +msgid "SISO/MISO" +msgstr "" + msgid "Starting EPG scan" msgstr "EPG skaneerimine käivitatud" @@ -563,6 +572,12 @@ msgstr "CA" msgid "Sid" msgstr "Sid" +msgid "Nid" +msgstr "" + +msgid "Tid" +msgstr "" + msgid "Channel settings are not unique!" msgstr "Kanaliseaded ei ole unikaalsed!" diff --git a/po/fi_FI.po b/po/fi_FI.po index 44951b77..002b4c70 100644 --- a/po/fi_FI.po +++ b/po/fi_FI.po @@ -80,6 +80,15 @@ msgstr "Rolloff" msgid "StreamId" msgstr "Lähetetunniste" +msgid "Pilot" +msgstr "Pilotti" + +msgid "T2SystemId" +msgstr "T2-tunniste" + +msgid "SISO/MISO" +msgstr "SISO/MISO" + msgid "Starting EPG scan" msgstr "Ohjelmaoppaan päivitys aloitettu" @@ -567,6 +576,12 @@ msgstr "Salaus (CA)" msgid "Sid" msgstr "Palvelu-ID" +msgid "Nid" +msgstr "Verkko-ID" + +msgid "Tid" +msgstr "Lähete-ID" + msgid "Channel settings are not unique!" msgstr "Kanava-asetukset eivät ole yksilölliset!" diff --git a/po/fr_FR.po b/po/fr_FR.po index e1cde724..d216725f 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -86,6 +86,15 @@ msgstr "Rolloff" msgid "StreamId" msgstr "StreamId" +msgid "Pilot" +msgstr "" + +msgid "T2SystemId" +msgstr "" + +msgid "SISO/MISO" +msgstr "" + msgid "Starting EPG scan" msgstr "Mise à jour du guide des programmes" @@ -573,6 +582,12 @@ msgstr "CA" msgid "Sid" msgstr "Sid" +msgid "Nid" +msgstr "" + +msgid "Tid" +msgstr "" + msgid "Channel settings are not unique!" msgstr "Cette chaîne n'est pas unique !" diff --git a/po/hr_HR.po b/po/hr_HR.po index 02aac416..6419a678 100644 --- a/po/hr_HR.po +++ b/po/hr_HR.po @@ -78,6 +78,15 @@ msgstr "" msgid "StreamId" msgstr "" +msgid "Pilot" +msgstr "" + +msgid "T2SystemId" +msgstr "" + +msgid "SISO/MISO" +msgstr "" + msgid "Starting EPG scan" msgstr "Poinjem EPG pretragu" @@ -565,6 +574,12 @@ msgstr "Kodiranje (CA)" msgid "Sid" msgstr "Sid" +msgid "Nid" +msgstr "" + +msgid "Tid" +msgstr "" + msgid "Channel settings are not unique!" msgstr "Postavke programa nisu jedinstvene!" diff --git a/po/hu_HU.po b/po/hu_HU.po index 55a1f7a5..d6a13c3d 100644 --- a/po/hu_HU.po +++ b/po/hu_HU.po @@ -80,6 +80,15 @@ msgstr "Rolloff" msgid "StreamId" msgstr "Stream azonosító" +msgid "Pilot" +msgstr "" + +msgid "T2SystemId" +msgstr "" + +msgid "SISO/MISO" +msgstr "" + msgid "Starting EPG scan" msgstr "EPG adatok aktualizálása" @@ -567,6 +576,12 @@ msgstr "CA" msgid "Sid" msgstr "Sid" +msgid "Nid" +msgstr "" + +msgid "Tid" +msgstr "" + msgid "Channel settings are not unique!" msgstr "Az adóbeállítások nem egyértelműek" diff --git a/po/it_IT.po b/po/it_IT.po index 37323508..107c1426 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 2.0.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-10-14 11:56+0200\n" +"POT-Creation-Date: 2013-11-03 15:59+0100\n" "PO-Revision-Date: 2013-11-10 23:02+0100\n" "Last-Translator: Diego Pierotto \n" "Language-Team: Italian \n" @@ -83,6 +83,15 @@ msgstr "Rolloff" msgid "StreamId" msgstr "StreamId" +msgid "Pilot" +msgstr "" + +msgid "T2SystemId" +msgstr "" + +msgid "SISO/MISO" +msgstr "" + msgid "Starting EPG scan" msgstr "Inizio scansione EPG" @@ -570,6 +579,12 @@ msgstr "CA" msgid "Sid" msgstr "Sid" +msgid "Nid" +msgstr "" + +msgid "Tid" +msgstr "" + msgid "Channel settings are not unique!" msgstr "Parametri canale non univoci!" diff --git a/po/lt_LT.po b/po/lt_LT.po index f702640f..d7067f8e 100644 --- a/po/lt_LT.po +++ b/po/lt_LT.po @@ -76,6 +76,15 @@ msgstr "Rolloff" msgid "StreamId" msgstr "StreamId" +msgid "Pilot" +msgstr "" + +msgid "T2SystemId" +msgstr "" + +msgid "SISO/MISO" +msgstr "" + msgid "Starting EPG scan" msgstr "Pradedamas EPG skanavimas" @@ -563,6 +572,12 @@ msgstr "CA (dekodavimo sistema)" msgid "Sid" msgstr "Serviso id" +msgid "Nid" +msgstr "" + +msgid "Tid" +msgstr "" + msgid "Channel settings are not unique!" msgstr "Kanalų nustatymai neunikalūs!" diff --git a/po/mk_MK.po b/po/mk_MK.po index f1811400..990a9f10 100644 --- a/po/mk_MK.po +++ b/po/mk_MK.po @@ -77,6 +77,15 @@ msgstr "Рол-оф" msgid "StreamId" msgstr "StreamId" +msgid "Pilot" +msgstr "" + +msgid "T2SystemId" +msgstr "" + +msgid "SISO/MISO" +msgstr "" + msgid "Starting EPG scan" msgstr "Започнувам скенирање на EPG" @@ -564,6 +573,12 @@ msgstr "Кодирање (CA)" msgid "Sid" msgstr "Sid" +msgid "Nid" +msgstr "" + +msgid "Tid" +msgstr "" + msgid "Channel settings are not unique!" msgstr "Уредбите на каналот не се уникатни!" diff --git a/po/nl_NL.po b/po/nl_NL.po index 8bc7526f..ffc66df4 100644 --- a/po/nl_NL.po +++ b/po/nl_NL.po @@ -81,6 +81,15 @@ msgstr "Rolloff" msgid "StreamId" msgstr "StreamId" +msgid "Pilot" +msgstr "" + +msgid "T2SystemId" +msgstr "" + +msgid "SISO/MISO" +msgstr "" + msgid "Starting EPG scan" msgstr "Bezig met starten EPG scan" @@ -568,6 +577,12 @@ msgstr "CA" msgid "Sid" msgstr "Sid" +msgid "Nid" +msgstr "" + +msgid "Tid" +msgstr "" + msgid "Channel settings are not unique!" msgstr "Kanaalinstellingen zijn niet uniek!" diff --git a/po/nn_NO.po b/po/nn_NO.po index d5a05d54..c0d32549 100644 --- a/po/nn_NO.po +++ b/po/nn_NO.po @@ -77,6 +77,15 @@ msgstr "" msgid "StreamId" msgstr "" +msgid "Pilot" +msgstr "" + +msgid "T2SystemId" +msgstr "" + +msgid "SISO/MISO" +msgstr "" + msgid "Starting EPG scan" msgstr "" @@ -564,6 +573,12 @@ msgstr "Kortleser" msgid "Sid" msgstr "Sid" +msgid "Nid" +msgstr "" + +msgid "Tid" +msgstr "" + msgid "Channel settings are not unique!" msgstr "" diff --git a/po/pl_PL.po b/po/pl_PL.po index d125ec3b..f67c6216 100644 --- a/po/pl_PL.po +++ b/po/pl_PL.po @@ -78,6 +78,15 @@ msgstr "Rolloff" msgid "StreamId" msgstr "StreamId" +msgid "Pilot" +msgstr "" + +msgid "T2SystemId" +msgstr "" + +msgid "SISO/MISO" +msgstr "" + msgid "Starting EPG scan" msgstr "Rozpoczynam skanowanie EPG" @@ -565,6 +574,12 @@ msgstr "CA" msgid "Sid" msgstr "Sid" +msgid "Nid" +msgstr "" + +msgid "Tid" +msgstr "" + msgid "Channel settings are not unique!" msgstr "Ustawienia kanau nie s unikalne!" diff --git a/po/pt_PT.po b/po/pt_PT.po index dae170f7..575d3c27 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -77,6 +77,15 @@ msgstr "Rolloff" msgid "StreamId" msgstr "" +msgid "Pilot" +msgstr "" + +msgid "T2SystemId" +msgstr "" + +msgid "SISO/MISO" +msgstr "" + msgid "Starting EPG scan" msgstr "A iniciar a busca do EPG" @@ -564,6 +573,12 @@ msgstr "CA" msgid "Sid" msgstr "Sid" +msgid "Nid" +msgstr "" + +msgid "Tid" +msgstr "" + msgid "Channel settings are not unique!" msgstr "Parmetros do canal no so nicos!" diff --git a/po/ro_RO.po b/po/ro_RO.po index 2421a380..fabbd4ed 100644 --- a/po/ro_RO.po +++ b/po/ro_RO.po @@ -78,6 +78,15 @@ msgstr "Rolloff" msgid "StreamId" msgstr "Identificator Stream" +msgid "Pilot" +msgstr "" + +msgid "T2SystemId" +msgstr "" + +msgid "SISO/MISO" +msgstr "" + msgid "Starting EPG scan" msgstr "Pornesc achiziţia EPG" @@ -565,6 +574,12 @@ msgstr "CA (Acces Condiţional)" msgid "Sid" msgstr "Sid" +msgid "Nid" +msgstr "" + +msgid "Tid" +msgstr "" + msgid "Channel settings are not unique!" msgstr "Parametrii canalului nu sunt univoci!" diff --git a/po/ru_RU.po b/po/ru_RU.po index d8aff45e..ee8ec373 100644 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -77,6 +77,15 @@ msgstr "Rolloff" msgid "StreamId" msgstr "StreamId" +msgid "Pilot" +msgstr "" + +msgid "T2SystemId" +msgstr "" + +msgid "SISO/MISO" +msgstr "" + msgid "Starting EPG scan" msgstr " EPG-" @@ -564,6 +573,12 @@ msgstr "CA ( msgid "Sid" msgstr "Sid" +msgid "Nid" +msgstr "" + +msgid "Tid" +msgstr "" + msgid "Channel settings are not unique!" msgstr " !" diff --git a/po/sk_SK.po b/po/sk_SK.po index 0f867c6d..97a6930d 100644 --- a/po/sk_SK.po +++ b/po/sk_SK.po @@ -76,6 +76,15 @@ msgstr "Rolloff" msgid "StreamId" msgstr "StreamId" +msgid "Pilot" +msgstr "" + +msgid "T2SystemId" +msgstr "" + +msgid "SISO/MISO" +msgstr "" + msgid "Starting EPG scan" msgstr "Spa sa snmanie EPG" @@ -563,6 +572,12 @@ msgstr "CA" msgid "Sid" msgstr "Sid" +msgid "Nid" +msgstr "" + +msgid "Tid" +msgstr "" + msgid "Channel settings are not unique!" msgstr "Nastavenia kanlu nie s vnimon!" diff --git a/po/sl_SI.po b/po/sl_SI.po index c7c4eba3..c3a899c3 100644 --- a/po/sl_SI.po +++ b/po/sl_SI.po @@ -77,6 +77,15 @@ msgstr "Odpadanje" msgid "StreamId" msgstr "StreamId" +msgid "Pilot" +msgstr "" + +msgid "T2SystemId" +msgstr "" + +msgid "SISO/MISO" +msgstr "" + msgid "Starting EPG scan" msgstr "Prienjam EPG-scan" @@ -564,6 +573,12 @@ msgstr "CA" msgid "Sid" msgstr "Sid" +msgid "Nid" +msgstr "" + +msgid "Tid" +msgstr "" + msgid "Channel settings are not unique!" msgstr "Nastavitve kanala niso edinstvene!" diff --git a/po/sr_RS.po b/po/sr_RS.po index c44c40b3..9f2ef6bd 100644 --- a/po/sr_RS.po +++ b/po/sr_RS.po @@ -77,6 +77,15 @@ msgstr "Rolloff" msgid "StreamId" msgstr "StreamId" +msgid "Pilot" +msgstr "" + +msgid "T2SystemId" +msgstr "" + +msgid "SISO/MISO" +msgstr "" + msgid "Starting EPG scan" msgstr "Poinje EPG pretraivanje" @@ -564,6 +573,12 @@ msgstr "Kodiranje (CA)" msgid "Sid" msgstr "Sid" +msgid "Nid" +msgstr "" + +msgid "Tid" +msgstr "" + msgid "Channel settings are not unique!" msgstr "Postavke kanala nisu jedinstvene!" diff --git a/po/sv_SE.po b/po/sv_SE.po index 4bdfee54..06a5f20b 100644 --- a/po/sv_SE.po +++ b/po/sv_SE.po @@ -80,6 +80,15 @@ msgstr "Rolloff" msgid "StreamId" msgstr "StreamId" +msgid "Pilot" +msgstr "" + +msgid "T2SystemId" +msgstr "" + +msgid "SISO/MISO" +msgstr "" + msgid "Starting EPG scan" msgstr "Pbrjar EPG-avskning" @@ -567,6 +576,12 @@ msgstr "Kortl msgid "Sid" msgstr "Sid" +msgid "Nid" +msgstr "" + +msgid "Tid" +msgstr "" + msgid "Channel settings are not unique!" msgstr "Kanalinstllningarna r ej unika!" diff --git a/po/tr_TR.po b/po/tr_TR.po index 795ea9f1..d79158dc 100644 --- a/po/tr_TR.po +++ b/po/tr_TR.po @@ -76,6 +76,15 @@ msgstr "" msgid "StreamId" msgstr "" +msgid "Pilot" +msgstr "" + +msgid "T2SystemId" +msgstr "" + +msgid "SISO/MISO" +msgstr "" + msgid "Starting EPG scan" msgstr "EPG tarama balyor" @@ -563,6 +572,12 @@ msgstr "CA" msgid "Sid" msgstr "Sid" +msgid "Nid" +msgstr "" + +msgid "Tid" +msgstr "" + msgid "Channel settings are not unique!" msgstr "Kanal ayarlar belli del!" diff --git a/po/uk_UA.po b/po/uk_UA.po index ea06c659..df11b8db 100644 --- a/po/uk_UA.po +++ b/po/uk_UA.po @@ -77,6 +77,15 @@ msgstr "Крен" msgid "StreamId" msgstr "StreamId" +msgid "Pilot" +msgstr "" + +msgid "T2SystemId" +msgstr "" + +msgid "SISO/MISO" +msgstr "" + msgid "Starting EPG scan" msgstr "Починаю EPG-сканування" @@ -564,6 +573,12 @@ msgstr "CA (декодер)" msgid "Sid" msgstr "Sid" +msgid "Nid" +msgstr "" + +msgid "Tid" +msgstr "" + msgid "Channel settings are not unique!" msgstr "Настройки каналу не єдині!" diff --git a/po/zh_CN.po b/po/zh_CN.po index a50b5bcc..648f61d7 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -78,6 +78,15 @@ msgstr "越零率" msgid "StreamId" msgstr "StreamId" +msgid "Pilot" +msgstr "" + +msgid "T2SystemId" +msgstr "" + +msgid "SISO/MISO" +msgstr "" + msgid "Starting EPG scan" msgstr "开始节目单扫描" @@ -565,6 +574,12 @@ msgstr "CA" msgid "Sid" msgstr "Sid" +msgid "Nid" +msgstr "" + +msgid "Tid" +msgstr "" + msgid "Channel settings are not unique!" msgstr "频道设置不是唯一的！" diff --git a/vdr.5 b/vdr.5 index 4c273a87..645ce38b 100644 --- a/vdr.5 +++ b/vdr.5 @@ -8,7 +8,7 @@ .\" License as specified in the file COPYING that comes with the .\" vdr distribution. .\" -.\" $Id: vdr.5 3.1 2013/08/11 13:50:42 kls Exp $ +.\" $Id: vdr.5 3.2 2014/03/16 10:38:31 kls Exp $ .\" .TH vdr 5 "31 Mar 2013" "2.0" "Video Disk Recorder Files" .SH NAME @@ -99,12 +99,15 @@ l l. \fBI\fR@Inversion (0, 1) \fBL\fR@Left circular polarization \fBM\fR@Modulation (2, 5, 6, 7, 10, 11, 12, 16, 32, 64, 128, 256, 999) +\fBN\fR@pilot mode (0, 1, 999) \fBO\fR@rollOff (0, 20, 25, 35) \fBP\fR@stream id (0-255) +\fBQ\fR@t2 system id (0-65535) \fBR\fR@Right circular polarization \fBS\fR@delivery System (0, 1) \fBT\fR@Transmission mode (1, 2, 4, 8, 16, 32) \fBV\fR@Vertical polarization +\fBX\fR@siso/miso mode (0, 1) \fBY\fR@hierarchY (0, 1, 2, 4) .TE @@ -139,6 +142,8 @@ l l. \fB256\fR@QAM256 (DVB-C, DVB-T2) .TE +\fBPilot mode:\fR The pilot mode (0 = "off", 1 = "on", 999 = "auto") for DVB-S2 multiplex (DVB-S2 only). + \fBRolloff:\fR The Nyquist filter rolloff factor for DVB-S (\fB35\fR) and DVB-S2 (\fB35\fR, 25, 20), 35 = 0.35, 25 = 0.25, 20 = 0.20, DVB-S/DVB-S2 default value is 0.35 @@ -146,8 +151,12 @@ l l. Physical Layer Pipe (PLP) id (\fB0\fR-255) for DVB-T2 multiplex (DVB-S2/DVB-T2 only, with devices that support "multi streaming"). +\fBT2 System id:\fR Unique identifier (\fB0\fR-65535) of T2 system within the DVB network (DVB-T2). + \fBTransmission mode:\fR Number of DVB-T OFDM carriers, 32 = 32k, 16 = 16k, 8 = 8k, 4 = 4k, 2 = 2k, 1 = 1k. If in doubt, try 8k. +\fBSISO/MISO mode:\fR Specifies the Single-Input/Multiple-Input Single-Output mode (\fB0\fR = SISO, 1 = MISO) (DVB-T2). + \fBHierarchy:\fR If set to 1, this transponder uses two streams, high priority and low priority. If in doubt, try 0 (off). (DVB-T/DVB-T2 only).