summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CONTRIBUTORS2
-rw-r--r--HISTORY5
-rw-r--r--UPDATE-2.0.01
-rw-r--r--dvbdevice.c15
-rw-r--r--dvbdevice.h8
-rw-r--r--nit.c19
-rw-r--r--po/ar.po4
-rw-r--r--po/ca_ES.po4
-rw-r--r--po/cs_CZ.po4
-rw-r--r--po/da_DK.po2
-rw-r--r--po/de_DE.po4
-rw-r--r--po/el_GR.po2
-rw-r--r--po/es_ES.po4
-rw-r--r--po/et_EE.po4
-rw-r--r--po/fi_FI.po4
-rw-r--r--po/fr_FR.po4
-rw-r--r--po/hr_HR.po2
-rw-r--r--po/hu_HU.po4
-rw-r--r--po/it_IT.po4
-rw-r--r--po/lt_LT.po4
-rw-r--r--po/mk_MK.po4
-rw-r--r--po/nl_NL.po4
-rw-r--r--po/nn_NO.po2
-rw-r--r--po/pl_PL.po4
-rw-r--r--po/pt_PT.po2
-rw-r--r--po/ro_RO.po4
-rw-r--r--po/ru_RU.po4
-rw-r--r--po/sk_SK.po4
-rw-r--r--po/sl_SI.po4
-rw-r--r--po/sr_SR.po2
-rw-r--r--po/sv_SE.po4
-rw-r--r--po/tr_TR.po2
-rw-r--r--po/uk_UA.po4
-rw-r--r--po/zh_CN.po4
-rw-r--r--vdr.58
35 files changed, 91 insertions, 65 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 708ddc29..9dbe19e9 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1159,6 +1159,8 @@ Rolf Ahrenberg <Rolf.Ahrenberg@saunalahti.fi>
for fixing reduced bpp support for DVB subtitles
for implementing "DVB Standard compliance" handling
for fixing the call to ChannelString() in cSkinLCARSDisplayChannel::SetChannel()
+ for a patch that was used to rename the "plp id" to a more general "stream id"
+ and add support for DVB-S2 "Input Stream Identifier" (ISI)
Ralf Klueber <ralf.klueber@vodafone.com>
for reporting a bug in cutting a recording if there is only a single editing mark
diff --git a/HISTORY b/HISTORY
index af3a3fd1..547023d3 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7689,7 +7689,7 @@ Video Disk Recorder Revision History
- When sorting recordings by name, folders are now always at the top of the list.
- Updated the Russian OSD texts (thanks to Oleg Roitburd).
-2013-03-06: Version 1.7.40
+2013-03-07: Version 1.7.40
- The "Recording info" page of the skins that come with VDR now displays the name of
the channel (if available) from which this recording was taken.
@@ -7717,3 +7717,6 @@ Video Disk Recorder Revision History
- Updated the Finnish OSD texts (thanks to Matti Lehtimki).
- Updated the Arabic OSD texts (thanks to Osama Alrawab).
- Updated the Romanian OSD texts (thanks to Lucian Muresan).
+- Renamed the "plp id" to a more general "stream id" and added support for DVB-S2
+ "Input Stream Identifier" (ISI) (based on a patch from Rolf Ahrenberg).
+ With this VDR now supports "multi streaming" on DVB-S2 and DVB-T2 transponders.
diff --git a/UPDATE-2.0.0 b/UPDATE-2.0.0
index e745f2a2..0632bfba 100644
--- a/UPDATE-2.0.0
+++ b/UPDATE-2.0.0
@@ -194,6 +194,7 @@ Devices:
handling of a CAM.
- The new functions cDevice::CanScaleVideo() and cDevice::ScaleVideo() can be used by
derived output devices to implement scaling the video to a given size and location.
+- Added support for DVB-S2 and DVB-T2 transponders that use "multi streaming".
DiSEqC:
diff --git a/dvbdevice.c b/dvbdevice.c
index 0a2f51a1..cd017a2d 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 2.83 2013/02/20 09:12:12 kls Exp $
+ * $Id: dvbdevice.c 2.84 2013/03/07 09:42:29 kls Exp $
*/
#include "dvbdevice.h"
@@ -23,6 +23,7 @@
#if (DVB_API_VERSION << 8 | DVB_API_VERSION_MINOR) < 0x0508
#define DTV_STREAM_ID DTV_DVBT2_PLP_ID
+#define FE_CAN_MULTISTREAM 0x4000000
#endif
#define DVBS_TUNE_TIMEOUT 9000 //ms
@@ -207,7 +208,7 @@ cDvbTransponderParameters::cDvbTransponderParameters(const char *Parameters)
guard = GUARD_INTERVAL_AUTO;
hierarchy = HIERARCHY_AUTO;
rollOff = ROLLOFF_AUTO;
- plpId = 0;
+ streamId = 0;
Parse(Parameters);
}
@@ -230,7 +231,7 @@ cString cDvbTransponderParameters::ToString(char Type) const
ST("ACST*") q += PrintParameter(q, 'I', MapToUser(inversion, InversionValues));
ST("ACST*") q += PrintParameter(q, 'M', MapToUser(modulation, ModulationValues));
ST(" S 2") q += PrintParameter(q, 'O', MapToUser(rollOff, RollOffValues));
- ST(" T2") q += PrintParameter(q, 'P', plpId);
+ ST(" ST2") q += PrintParameter(q, 'P', streamId);
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(" T*") q += PrintParameter(q, 'Y', MapToUser(hierarchy, HierarchyValues));
@@ -266,7 +267,7 @@ bool cDvbTransponderParameters::Parse(const char *s)
case 'L': polarization = 'L'; s++; break;
case 'M': s = ParseParameter(s, modulation, ModulationValues); break;
case 'O': s = ParseParameter(s, rollOff, RollOffValues); break;
- case 'P': s = ParseParameter(s, plpId); break;
+ case 'P': s = ParseParameter(s, streamId); 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;
@@ -795,6 +796,7 @@ bool cDvbTuner::SetFrontend(void)
// DVB-S2
SETCMD(DTV_PILOT, PILOT_AUTO);
SETCMD(DTV_ROLLOFF, dtp.RollOff());
+ SETCMD(DTV_STREAM_ID, dtp.StreamId());
}
else {
// DVB-S
@@ -828,7 +830,7 @@ bool cDvbTuner::SetFrontend(void)
SETCMD(DTV_HIERARCHY, dtp.Hierarchy());
if (frontendType == SYS_DVBT2) {
// DVB-T2
- SETCMD(DTV_STREAM_ID, dtp.PlpId());
+ SETCMD(DTV_STREAM_ID, dtp.StreamId());
}
tuneTimeout = DVBT_TUNE_TIMEOUT;
@@ -968,7 +970,7 @@ cOsdItem *cDvbSourceParam::GetOsdItem(void)
case 9: ST(" T") return new cMenuEditMapItem( tr("Guard"), &dtp.guard, GuardValues); else return GetOsdItem();
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(" T") return new cMenuEditIntItem( tr("PlpId"), &dtp.plpId, 0, 255); else return GetOsdItem();
+ case 12: ST(" ST") return new cMenuEditIntItem( tr("StreamId"), &dtp.streamId, 0, 255); else return GetOsdItem();
default: return NULL;
}
return NULL;
@@ -1436,6 +1438,7 @@ bool cDvbDevice::ProvidesTransponder(const cChannel *Channel) const
return false; // doesn't provide source
cDvbTransponderParameters dtp(Channel->Parameters());
if (!ProvidesDeliverySystem(GetRequiredDeliverySystem(Channel, &dtp)) ||
+ dtp.StreamId() != 0 && !(frontendInfo.caps & FE_CAN_MULTISTREAM) ||
dtp.Modulation() == QPSK && !(frontendInfo.caps & FE_CAN_QPSK) ||
dtp.Modulation() == QAM_16 && !(frontendInfo.caps & FE_CAN_QAM_16) ||
dtp.Modulation() == QAM_32 && !(frontendInfo.caps & FE_CAN_QAM_32) ||
diff --git a/dvbdevice.h b/dvbdevice.h
index 3674a615..b4d07f58 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 2.28 2013/02/16 15:20:17 kls Exp $
+ * $Id: dvbdevice.h 2.29 2013/03/07 09:42:29 kls Exp $
*/
#ifndef __DVBDEVICE_H
@@ -69,7 +69,7 @@ private:
int guard;
int hierarchy;
int rollOff;
- int plpId;
+ int streamId;
int PrintParameter(char *p, char Name, int Value) const;
const char *ParseParameter(const char *s, int &Value, const tDvbParameterMap *Map = NULL);
public:
@@ -85,7 +85,7 @@ public:
int Guard(void) const { return guard; }
int Hierarchy(void) const { return hierarchy; }
int RollOff(void) const { return rollOff; }
- int PlpId(void) const { return plpId; }
+ int StreamId(void) const { return streamId; }
void SetPolarization(char Polarization) { polarization = Polarization; }
void SetInversion(int Inversion) { inversion = Inversion; }
void SetBandwidth(int Bandwidth) { bandwidth = Bandwidth; }
@@ -97,7 +97,7 @@ public:
void SetGuard(int Guard) { guard = Guard; }
void SetHierarchy(int Hierarchy) { hierarchy = Hierarchy; }
void SetRollOff(int RollOff) { rollOff = RollOff; }
- void SetPlpId(int PlpId) { plpId = PlpId; }
+ void SetStreamId(int StreamId) { streamId = StreamId; }
cString ToString(char Type) const;
bool Parse(const char *s);
};
diff --git a/nit.c b/nit.c
index c18aa826..89988618 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 2.9 2012/01/12 08:43:52 kls Exp $
+ * $Id: nit.c 2.10 2013/03/07 09:42:29 kls Exp $
*/
#include "nit.h"
@@ -185,6 +185,21 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
}
}
break;
+ case SI::S2SatelliteDeliverySystemDescriptorTag: {
+ if (Setup.UpdateChannels >= 5) {
+ for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
+ if (!Channel->GroupSep() && cSource::IsSat(Channel->Source()) && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) {
+ SI::S2SatelliteDeliverySystemDescriptor *sd = (SI::S2SatelliteDeliverySystemDescriptor *)d;
+ cDvbTransponderParameters dtp(Channel->Parameters());
+ dtp.SetSystem(DVB_SYSTEM_2);
+ dtp.SetStreamId(sd->getInputStreamIdentifier());
+ Channel->SetTransponderData(Channel->Source(), Channel->Frequency(), Channel->Srate(), dtp.ToString('S'));
+ break;
+ }
+ }
+ }
+ }
+ break;
case SI::CableDeliverySystemDescriptorTag: {
SI::CableDeliverySystemDescriptor *sd = (SI::CableDeliverySystemDescriptor *)d;
cDvbTransponderParameters dtp;
@@ -317,7 +332,7 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
//int SystemId = td->getSystemId();
cDvbTransponderParameters dtp(Channel->Parameters());
dtp.SetSystem(DVB_SYSTEM_2);
- dtp.SetPlpId(td->getPlpId());
+ dtp.SetStreamId(td->getPlpId());
if (td->getExtendedDataFlag()) {
static int T2Bandwidths[] = { 8000000, 7000000, 6000000, 5000000, 10000000, 1712000, 0, 0 };
dtp.SetBandwidth(T2Bandwidths[td->getBandwidth()]);
diff --git a/po/ar.po b/po/ar.po
index 91cac46e..80d3e7de 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -77,8 +77,8 @@ msgstr "الهرمية"
msgid "Rolloff"
msgstr "Rolloff"
-msgid "PlpId"
-msgstr "PlpId"
+msgid "StreamId"
+msgstr "StreamId"
msgid "Starting EPG scan"
msgstr "EPG ا لبدء بالبحث على دليل القنوات الالكترونى "
diff --git a/po/ca_ES.po b/po/ca_ES.po
index c5daba7a..22aeb052 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -76,8 +76,8 @@ msgstr "Jerarquia"
msgid "Rolloff"
msgstr "Rolloff"
-msgid "PlpId"
-msgstr "PlpId"
+msgid "StreamId"
+msgstr "StreamId"
msgid "Starting EPG scan"
msgstr "Iniciant exploraci EPG"
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index 65efecd7..818c9c17 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -76,8 +76,8 @@ msgstr "Hierarchický mód"
msgid "Rolloff"
msgstr "RollOff"
-msgid "PlpId"
-msgstr "PlpId"
+msgid "StreamId"
+msgstr "StreamId"
msgid "Starting EPG scan"
msgstr "Začíná prohledávání EPG"
diff --git a/po/da_DK.po b/po/da_DK.po
index 583ce0da..73a21221 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -73,7 +73,7 @@ msgstr "Hierarki"
msgid "Rolloff"
msgstr ""
-msgid "PlpId"
+msgid "StreamId"
msgstr ""
msgid "Starting EPG scan"
diff --git a/po/de_DE.po b/po/de_DE.po
index cb2b25a7..9e879771 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -73,8 +73,8 @@ msgstr "Hierarchie"
msgid "Rolloff"
msgstr "Rolloff"
-msgid "PlpId"
-msgstr "PlpId"
+msgid "StreamId"
+msgstr "StreamId"
msgid "Starting EPG scan"
msgstr "Aktualisiere EPG-Daten"
diff --git a/po/el_GR.po b/po/el_GR.po
index 62039e06..50fe4601 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -73,7 +73,7 @@ msgstr ""
msgid "Rolloff"
msgstr ""
-msgid "PlpId"
+msgid "StreamId"
msgstr ""
msgid "Starting EPG scan"
diff --git a/po/es_ES.po b/po/es_ES.po
index 97427849..2ef8807a 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -74,8 +74,8 @@ msgstr "Jerarqua"
msgid "Rolloff"
msgstr "Rolloff"
-msgid "PlpId"
-msgstr "PlpId"
+msgid "StreamId"
+msgstr "StreamId"
msgid "Starting EPG scan"
msgstr "Iniciando la exploracin de EPG"
diff --git a/po/et_EE.po b/po/et_EE.po
index 431407b2..e60cf5ae 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -73,8 +73,8 @@ msgstr "Hierarhia"
msgid "Rolloff"
msgstr "Rolloff"
-msgid "PlpId"
-msgstr "PLP-tunnus"
+msgid "StreamId"
+msgstr "Stream-tunnus"
msgid "Starting EPG scan"
msgstr "EPG skaneerimine käivitatud"
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 5ab95447..7475eb79 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -77,8 +77,8 @@ msgstr "Hierarkia"
msgid "Rolloff"
msgstr "Rolloff"
-msgid "PlpId"
-msgstr "PLP-tunniste"
+msgid "StreamId"
+msgstr "Lähetetunniste"
msgid "Starting EPG scan"
msgstr "Ohjelmaoppaan päivitys aloitettu"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 4789c09e..57a6927b 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -83,8 +83,8 @@ msgstr "Hiérarchie"
msgid "Rolloff"
msgstr "Rolloff"
-msgid "PlpId"
-msgstr "PlpId"
+msgid "StreamId"
+msgstr "StreamId"
msgid "Starting EPG scan"
msgstr "Mise à jour du guide des programmes"
diff --git a/po/hr_HR.po b/po/hr_HR.po
index 61e43384..3a0f73ab 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -75,7 +75,7 @@ msgstr "Hijerarhija"
msgid "Rolloff"
msgstr ""
-msgid "PlpId"
+msgid "StreamId"
msgstr ""
msgid "Starting EPG scan"
diff --git a/po/hu_HU.po b/po/hu_HU.po
index 6c8867b4..26ed167a 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -77,8 +77,8 @@ msgstr "Hierarhia"
msgid "Rolloff"
msgstr "Rolloff"
-msgid "PlpId"
-msgstr "PLP azonosító"
+msgid "StreamId"
+msgstr "Stream azonosító"
msgid "Starting EPG scan"
msgstr "EPG adatok aktualizálása"
diff --git a/po/it_IT.po b/po/it_IT.po
index b33214db..ebd68f9b 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -80,8 +80,8 @@ msgstr "Gerarchia"
msgid "Rolloff"
msgstr "Rolloff"
-msgid "PlpId"
-msgstr "PlpId"
+msgid "StreamId"
+msgstr "StreamId"
msgid "Starting EPG scan"
msgstr "Inizio scansione EPG"
diff --git a/po/lt_LT.po b/po/lt_LT.po
index f895851c..6337db4b 100644
--- a/po/lt_LT.po
+++ b/po/lt_LT.po
@@ -73,8 +73,8 @@ msgstr "Hierarchija"
msgid "Rolloff"
msgstr "Rolloff"
-msgid "PlpId"
-msgstr "PlpId"
+msgid "StreamId"
+msgstr "StreamId"
msgid "Starting EPG scan"
msgstr "Pradedamas EPG skanavimas"
diff --git a/po/mk_MK.po b/po/mk_MK.po
index 15fa04e1..39444c74 100644
--- a/po/mk_MK.po
+++ b/po/mk_MK.po
@@ -74,8 +74,8 @@ msgstr "Хиерархија"
msgid "Rolloff"
msgstr "Рол-оф"
-msgid "PlpId"
-msgstr "PlpId"
+msgid "StreamId"
+msgstr "StreamId"
msgid "Starting EPG scan"
msgstr "Започнувам скенирање на EPG"
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 09ce0009..1d1bb731 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -78,8 +78,8 @@ msgstr "Hierarchie"
msgid "Rolloff"
msgstr "Rolloff"
-msgid "PlpId"
-msgstr "PlpId"
+msgid "StreamId"
+msgstr "StreamId"
msgid "Starting EPG scan"
msgstr "Bezig met starten EPG scan"
diff --git a/po/nn_NO.po b/po/nn_NO.po
index 57793b3f..c8491e1e 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -74,7 +74,7 @@ msgstr "Hierarchy"
msgid "Rolloff"
msgstr ""
-msgid "PlpId"
+msgid "StreamId"
msgstr ""
msgid "Starting EPG scan"
diff --git a/po/pl_PL.po b/po/pl_PL.po
index 4f9bdd30..35a39c43 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -75,8 +75,8 @@ msgstr "Hierarchia"
msgid "Rolloff"
msgstr "Rolloff"
-msgid "PlpId"
-msgstr "PlpId"
+msgid "StreamId"
+msgstr "StreamId"
msgid "Starting EPG scan"
msgstr "Rozpoczynam skanowanie EPG"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index e035ff63..a485e2ba 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -74,7 +74,7 @@ msgstr "Hierarquia"
msgid "Rolloff"
msgstr "Rolloff"
-msgid "PlpId"
+msgid "StreamId"
msgstr ""
msgid "Starting EPG scan"
diff --git a/po/ro_RO.po b/po/ro_RO.po
index d5743bc3..a7b6ce81 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -75,8 +75,8 @@ msgstr "Ierarhie"
msgid "Rolloff"
msgstr "Rolloff"
-msgid "PlpId"
-msgstr "Identificator PLP"
+msgid "StreamId"
+msgstr "Identificator Stream"
msgid "Starting EPG scan"
msgstr "Pornesc achiziţia EPG"
diff --git a/po/ru_RU.po b/po/ru_RU.po
index d85aa89e..ea09a3ff 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -74,8 +74,8 @@ msgstr ""
msgid "Rolloff"
msgstr "Rolloff"
-msgid "PlpId"
-msgstr "PlpId"
+msgid "StreamId"
+msgstr "StreamId"
msgid "Starting EPG scan"
msgstr " EPG-"
diff --git a/po/sk_SK.po b/po/sk_SK.po
index 515f7be2..977d7636 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -73,8 +73,8 @@ msgstr "Hierarchia"
msgid "Rolloff"
msgstr "Rolloff"
-msgid "PlpId"
-msgstr "PlpId"
+msgid "StreamId"
+msgstr "StreamId"
msgid "Starting EPG scan"
msgstr "Spa sa snmanie EPG"
diff --git a/po/sl_SI.po b/po/sl_SI.po
index 2e476057..86fefbc0 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -74,8 +74,8 @@ msgstr "Hierarhija"
msgid "Rolloff"
msgstr "Odpadanje"
-msgid "PlpId"
-msgstr "PlpId"
+msgid "StreamId"
+msgstr "StreamId"
msgid "Starting EPG scan"
msgstr "Prienjam EPG-scan"
diff --git a/po/sr_SR.po b/po/sr_SR.po
index 47a5a2af..d6b5f7af 100644
--- a/po/sr_SR.po
+++ b/po/sr_SR.po
@@ -73,7 +73,7 @@ msgstr "Hijerarhija"
msgid "Rolloff"
msgstr ""
-msgid "PlpId"
+msgid "StreamId"
msgstr ""
msgid "Starting EPG scan"
diff --git a/po/sv_SE.po b/po/sv_SE.po
index dc1aa886..9b2ce7cc 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -77,8 +77,8 @@ msgstr "Hierarchy"
msgid "Rolloff"
msgstr "Rolloff"
-msgid "PlpId"
-msgstr "PlpId"
+msgid "StreamId"
+msgstr "StreamId"
msgid "Starting EPG scan"
msgstr "Pbrjar EPG-avskning"
diff --git a/po/tr_TR.po b/po/tr_TR.po
index 1a418ebb..b5f57b02 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -73,7 +73,7 @@ msgstr "Hiyerari"
msgid "Rolloff"
msgstr ""
-msgid "PlpId"
+msgid "StreamId"
msgstr ""
msgid "Starting EPG scan"
diff --git a/po/uk_UA.po b/po/uk_UA.po
index 165143f1..47534324 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -74,8 +74,8 @@ msgstr "Ієрархія"
msgid "Rolloff"
msgstr "Крен"
-msgid "PlpId"
-msgstr "PlpId"
+msgid "StreamId"
+msgstr "StreamId"
msgid "Starting EPG scan"
msgstr "Починаю EPG-сканування"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 5e626f81..efb03006 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -75,8 +75,8 @@ msgstr "层次"
msgid "Rolloff"
msgstr "越零率"
-msgid "PlpId"
-msgstr "PlpId"
+msgid "StreamId"
+msgstr "StreamId"
msgid "Starting EPG scan"
msgstr "开始节目单扫描"
diff --git a/vdr.5 b/vdr.5
index 4003a5e9..ca705d4b 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 2.30 2012/10/15 10:50:23 kls Exp $
+.\" $Id: vdr.5 2.31 2013/03/07 09:42:29 kls Exp $
.\"
.TH vdr 5 "10 Feb 2008" "1.6" "Video Disk Recorder Files"
.SH NAME
@@ -96,7 +96,7 @@ l l.
\fBL\fR@Left circular polarization
\fBM\fR@Modulation (2, 5, 6, 10, 11, 16, 32, 64, 128, 256, 998)
\fBO\fR@rollOff (0, 20, 25, 35)
-\fBP\fR@Plp id (0-255)
+\fBP\fR@stream id (0-255)
\fBR\fR@Right circular polarization
\fBS\fR@delivery System (0, 1)
\fBT\fR@Transmission mode (1, 2, 4, 8, 16, 32)
@@ -137,7 +137,9 @@ l l.
\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
-\fBPLP id:\fR Physical Layer Pipe (PLP) id (\fB0\fR-255) for DVB-T2 multiplex (DVB-T2 only).
+\fBStream id:\fR Input Stream Identifier (ISI) (\fB0\fR-255) for DVB-S2 multiplex or
+Physical Layer Pipe (PLP) id (\fB0\fR-255) for DVB-T2 multiplex (DVB-S2/DVB-T2 only,
+with devices that support "multi streaming").
\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.
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-21 10:19:36 +0000