From f54c810bcd80221f5f07590233a563d93f49ffe8 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Fri, 8 Feb 2008 13:48:31 +0100 Subject: [PATCH] Revoked the switch to the "multiproto" driver in order to make a new stable version --- HISTORY | 8 +- channels.c | 218 +++++++++++++-------------------------- channels.h | 22 +--- config.h | 10 +- device.c | 23 +---- device.h | 8 +- dvbdevice.c | 291 ++++++++++++++++++++-------------------------------- dvbdevice.h | 10 +- menu.c | 80 +++++++++++++-- menuitems.c | 60 +---------- menuitems.h | 13 +-- nit.c | 38 +++---- pat.c | 3 +- po/ca_ES.po | 44 +++----- po/cs_CZ.po | 44 +++----- po/da_DK.po | 44 +++----- po/de_DE.po | 44 +++----- po/el_GR.po | 44 +++----- po/es_ES.po | 44 +++----- po/et_EE.po | 44 +++----- po/fi_FI.po | 44 +++----- po/fr_FR.po | 44 +++----- po/hr_HR.po | 44 +++----- po/hu_HU.po | 44 +++----- po/it_IT.po | 90 +++++++--------- po/nl_NL.po | 44 +++----- po/nn_NO.po | 44 +++----- po/pl_PL.po | 44 +++----- po/pt_PT.po | 44 +++----- po/ro_RO.po | 44 +++----- po/ru_RU.po | 44 +++----- po/sl_SI.po | 44 +++----- po/sv_SE.po | 44 +++----- po/tr_TR.po | 44 +++----- po/uk_UA.po | 44 +++----- sdt.c | 3 +- vdr.5 | 18 ++-- 37 files changed, 612 insertions(+), 1207 deletions(-) diff --git a/HISTORY b/HISTORY index 5328d1db..8e3a2dab 100644 --- a/HISTORY +++ b/HISTORY @@ -5579,7 +5579,13 @@ Video Disk Recorder Revision History is not available, in order to allow staying on an encrypted channel that takes a while for the CAM to start decrypting. -2008-02-01: Version 1.5.15 +2008-02-08: Version 1.5.15 - Updated the Italian OSD texts (thanks to Diego Pierotto). - Added option -i to the pictures plugin's pic2mpg to ignore unknown file types. +- Revoked the switch to the "multiproto" driver in order to make a new stable + version before making this big switch and forcing all users to install a + driver that is not yet in the kernel source. The removed code will reappear + in version 1.7.0. + Note that you may need to switch back to an older version of your channels.conf + file if you have already used version 1.5.14, because it introduced new parameters. diff --git a/channels.c b/channels.c index dd1967f1..aadd4bba 100644 --- a/channels.c +++ b/channels.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: channels.c 1.56 2008/01/27 13:59:53 kls Exp $ + * $Id: channels.c 1.57 2008/02/08 13:43:07 kls Exp $ */ #include "channels.h" @@ -21,114 +21,67 @@ // -- Channel Parameter Maps ------------------------------------------------- const tChannelParameterMap InversionValues[] = { - { 0, DVBFE_INVERSION_OFF, trNOOP("off") }, - { 1, DVBFE_INVERSION_ON, trNOOP("on") }, - { 999, DVBFE_INVERSION_AUTO }, + { 0, INVERSION_OFF }, + { 1, INVERSION_ON }, + { 999, INVERSION_AUTO }, { -1 } }; const tChannelParameterMap BandwidthValues[] = { - { 5, DVBFE_BANDWIDTH_5_MHZ, "5 MHz" }, - { 6, DVBFE_BANDWIDTH_6_MHZ, "6 MHz" }, - { 7, DVBFE_BANDWIDTH_7_MHZ, "7 MHz" }, - { 8, DVBFE_BANDWIDTH_8_MHZ, "8 MHz" }, - { 999, DVBFE_BANDWIDTH_AUTO }, + { 6, BANDWIDTH_6_MHZ }, + { 7, BANDWIDTH_7_MHZ }, + { 8, BANDWIDTH_8_MHZ }, + { 999, BANDWIDTH_AUTO }, { -1 } }; const tChannelParameterMap CoderateValues[] = { - { 0, DVBFE_FEC_NONE, trNOOP("none") }, - { 12, DVBFE_FEC_1_2, "1/2" }, - { 13, DVBFE_FEC_1_3, "1/3" }, - { 14, DVBFE_FEC_1_4, "1/4" }, - { 23, DVBFE_FEC_2_3, "2/3" }, - { 25, DVBFE_FEC_2_5, "2/5" }, - { 34, DVBFE_FEC_3_4, "3/4" }, - { 35, DVBFE_FEC_3_5, "3/5" }, - { 45, DVBFE_FEC_4_5, "4/5" }, - { 56, DVBFE_FEC_5_6, "5/6" }, - { 67, DVBFE_FEC_6_7, "6/7" }, - { 78, DVBFE_FEC_7_8, "7/8" }, - { 89, DVBFE_FEC_8_9, "8/9" }, - { 910, DVBFE_FEC_9_10, "9/10" }, - { 999, DVBFE_FEC_AUTO }, + { 0, FEC_NONE }, + { 12, FEC_1_2 }, + { 23, FEC_2_3 }, + { 34, FEC_3_4 }, + { 45, FEC_4_5 }, + { 56, FEC_5_6 }, + { 67, FEC_6_7 }, + { 78, FEC_7_8 }, + { 89, FEC_8_9 }, + { 999, FEC_AUTO }, { -1 } }; const tChannelParameterMap ModulationValues[] = { - { 0, DVBFE_MOD_NONE, trNOOP("none") }, - { 4, DVBFE_MOD_QAM4, "QAM4" }, - { 16, DVBFE_MOD_QAM16, "QAM16" }, - { 32, DVBFE_MOD_QAM32, "QAM32" }, - { 64, DVBFE_MOD_QAM64, "QAM64" }, - { 128, DVBFE_MOD_QAM128, "QAM128" }, - { 256, DVBFE_MOD_QAM256, "QAM256" }, - { 512, DVBFE_MOD_QAM512, "QAM512" }, - {1024, DVBFE_MOD_QAM1024, "QAM1024" }, - { 1, DVBFE_MOD_BPSK, "BPSK" }, - { 2, DVBFE_MOD_QPSK, "QPSK" }, - { 3, DVBFE_MOD_OQPSK, "OQPSK" }, - { 5, DVBFE_MOD_8PSK, "8PSK" }, - { 6, DVBFE_MOD_16APSK, "16APSK" }, - { 7, DVBFE_MOD_32APSK, "32APSK" }, - { 8, DVBFE_MOD_OFDM, "OFDM" }, - { 9, DVBFE_MOD_COFDM, "COFDM" }, - { 10, DVBFE_MOD_VSB8, "VSB8" }, - { 11, DVBFE_MOD_VSB16, "VSB16" }, - { 998, DVBFE_MOD_QAMAUTO, "QAMAUTO" }, - { 999, DVBFE_MOD_AUTO }, - { -1 } - }; - -const tChannelParameterMap SystemValues[] = { - { 0, DVBFE_DELSYS_DVBS, "DVB-S" }, - { 1, DVBFE_DELSYS_DVBS2, "DVB-S2" }, + { 0, QPSK }, + { 16, QAM_16 }, + { 32, QAM_32 }, + { 64, QAM_64 }, + { 128, QAM_128 }, + { 256, QAM_256 }, + { 999, QAM_AUTO }, { -1 } }; const tChannelParameterMap TransmissionValues[] = { - { 2, DVBFE_TRANSMISSION_MODE_2K, "2K" }, - { 4, DVBFE_TRANSMISSION_MODE_4K, "4K" }, - { 8, DVBFE_TRANSMISSION_MODE_8K, "8K" }, - { 999, DVBFE_TRANSMISSION_MODE_AUTO }, + { 2, TRANSMISSION_MODE_2K }, + { 8, TRANSMISSION_MODE_8K }, + { 999, TRANSMISSION_MODE_AUTO }, { -1 } }; const tChannelParameterMap GuardValues[] = { - { 4, DVBFE_GUARD_INTERVAL_1_4, "1/4" }, - { 8, DVBFE_GUARD_INTERVAL_1_8, "1/8" }, - { 16, DVBFE_GUARD_INTERVAL_1_16, "1/16" }, - { 32, DVBFE_GUARD_INTERVAL_1_32, "1/32" }, - { 999, DVBFE_GUARD_INTERVAL_AUTO }, + { 4, GUARD_INTERVAL_1_4 }, + { 8, GUARD_INTERVAL_1_8 }, + { 16, GUARD_INTERVAL_1_16 }, + { 32, GUARD_INTERVAL_1_32 }, + { 999, GUARD_INTERVAL_AUTO }, { -1 } }; const tChannelParameterMap HierarchyValues[] = { - { 0, DVBFE_HIERARCHY_OFF, trNOOP("off") }, - { 1, DVBFE_HIERARCHY_ON, trNOOP("on") }, - { 999, DVBFE_HIERARCHY_AUTO }, - { -1 } - }; - -const tChannelParameterMap AlphaValues[] = { - { 0, 0 }, - { 1, DVBFE_ALPHA_1 }, - { 2, DVBFE_ALPHA_2 }, - { 4, DVBFE_ALPHA_4 }, - { -1 } - }; - -const tChannelParameterMap PriorityValues[] = { - { 0, DVBFE_STREAM_PRIORITY_HP, trNOOP("high") }, - { 1, DVBFE_STREAM_PRIORITY_LP, trNOOP("low") }, - { -1 } - }; - -const tChannelParameterMap RollOffValues[] = { - { 0, DVBFE_ROLLOFF_UNKNOWN }, - { 20, DVBFE_ROLLOFF_20, "0.20" }, - { 25, DVBFE_ROLLOFF_25, "0.25" }, - { 35, DVBFE_ROLLOFF_35, "0.35" }, + { 0, HIERARCHY_NONE }, + { 1, HIERARCHY_1 }, + { 2, HIERARCHY_2 }, + { 4, HIERARCHY_4 }, + { 999, HIERARCHY_AUTO }, { -1 } }; @@ -154,14 +107,11 @@ int DriverIndex(int Value, const tChannelParameterMap *Map) return -1; } -int MapToUser(int Value, const tChannelParameterMap *Map, const char **String) +int MapToUser(int Value, const tChannelParameterMap *Map) { int n = DriverIndex(Value, Map); - if (n >= 0) { - if (String) - *String = tr(Map[n].userString); + if (n >= 0) return Map[n].userValue; - } return -1; } @@ -217,18 +167,14 @@ cChannel::cChannel(void) provider = strdup(""); portalName = strdup(""); memset(&__BeginData__, 0, (char *)&__EndData__ - (char *)&__BeginData__); - inversion = DVBFE_INVERSION_AUTO; - bandwidth = DVBFE_BANDWIDTH_AUTO; - coderateH = DVBFE_FEC_AUTO; - coderateL = DVBFE_FEC_AUTO; - modulation = DVBFE_MOD_AUTO; - system = DVBFE_DELSYS_DVBS; - transmission = DVBFE_TRANSMISSION_MODE_AUTO; - guard = DVBFE_GUARD_INTERVAL_AUTO; - hierarchy = DVBFE_HIERARCHY_AUTO; - alpha = 0; - priority = DVBFE_STREAM_PRIORITY_HP; - rollOff = DVBFE_ROLLOFF_UNKNOWN; + inversion = INVERSION_AUTO; + bandwidth = BANDWIDTH_AUTO; + coderateH = FEC_AUTO; + coderateL = FEC_AUTO; + modulation = QAM_AUTO; + transmission = TRANSMISSION_MODE_AUTO; + guard = GUARD_INTERVAL_AUTO; + hierarchy = HIERARCHY_AUTO; modification = CHANNELMOD_NONE; schedule = NULL; linkChannels = NULL; @@ -331,17 +277,13 @@ void cChannel::CopyTransponderData(const cChannel *Channel) coderateH = Channel->coderateH; coderateL = Channel->coderateL; modulation = Channel->modulation; - system = Channel->system; transmission = Channel->transmission; guard = Channel->guard; hierarchy = Channel->hierarchy; - alpha = Channel->alpha; - priority = Channel->priority; - rollOff = Channel->rollOff; } } -bool cChannel::SetSatTransponderData(int Source, int Frequency, char Polarization, int Srate, int CoderateH, int Modulation, int System, int RollOff) +bool cChannel::SetSatTransponderData(int Source, int Frequency, char Polarization, int Srate, int CoderateH) { // Workarounds for broadcaster stupidity: // Some providers broadcast the transponder frequency of their channels with two different @@ -355,22 +297,19 @@ bool cChannel::SetSatTransponderData(int Source, int Frequency, char Polarizatio if (abs(srate - Srate) <= 1) Srate = srate; - if (source != Source || frequency != Frequency || polarization != Polarization || srate != Srate || coderateH != CoderateH || modulation != Modulation || system != System || rollOff != RollOff) { - cString OldParameters = ParametersToString(); + if (source != Source || frequency != Frequency || polarization != Polarization || srate != Srate || coderateH != CoderateH) { + if (Number()) { + dsyslog("changing transponder data of channel %d from %s:%d:%c:%d:%d to %s:%d:%c:%d:%d", Number(), *cSource::ToString(source), frequency, polarization, srate, coderateH, *cSource::ToString(Source), Frequency, Polarization, Srate, CoderateH); + modification |= CHANNELMOD_TRANSP; + Channels.SetModified(); + } source = Source; frequency = Frequency; polarization = Polarization; srate = Srate; coderateH = CoderateH; - modulation = Modulation; - system = System; - rollOff = RollOff; + modulation = QPSK; schedule = NULL; - if (Number()) { - dsyslog("changing transponder data of channel %d from %d:%s:%s:%d to %d:%s:%s:%d", Number(), frequency, *OldParameters, *cSource::ToString(source), srate, Frequency, *ParametersToString(), *cSource::ToString(Source), Srate); - modification |= CHANNELMOD_TRANSP; - Channels.SetModified(); - } } return true; } @@ -378,26 +317,29 @@ bool cChannel::SetSatTransponderData(int Source, int Frequency, char Polarizatio bool cChannel::SetCableTransponderData(int Source, int Frequency, int Modulation, int Srate, int CoderateH) { if (source != Source || frequency != Frequency || modulation != Modulation || srate != Srate || coderateH != CoderateH) { - cString OldParameters = ParametersToString(); + if (Number()) { + dsyslog("changing transponder data of channel %d from %s:%d:%d:%d:%d to %s:%d:%d:%d:%d", Number(), *cSource::ToString(source), frequency, modulation, srate, coderateH, *cSource::ToString(Source), Frequency, Modulation, Srate, CoderateH); + modification |= CHANNELMOD_TRANSP; + Channels.SetModified(); + } source = Source; frequency = Frequency; modulation = Modulation; srate = Srate; coderateH = CoderateH; schedule = NULL; - if (Number()) { - dsyslog("changing transponder data of channel %d from %d:%s:%s:%d to %d:%s:%s:%d", Number(), frequency, *OldParameters, *cSource::ToString(source), srate, Frequency, *ParametersToString(), *cSource::ToString(Source), Srate); - modification |= CHANNELMOD_TRANSP; - Channels.SetModified(); - } } return true; } -bool cChannel::SetTerrTransponderData(int Source, int Frequency, int Bandwidth, int Modulation, int Hierarchy, int CoderateH, int CoderateL, int Guard, int Transmission, int Alpha, int Priority) +bool cChannel::SetTerrTransponderData(int Source, int Frequency, int Bandwidth, int Modulation, int Hierarchy, int CoderateH, int CoderateL, int Guard, int Transmission) { - if (source != Source || frequency != Frequency || bandwidth != Bandwidth || modulation != Modulation || hierarchy != Hierarchy || coderateH != CoderateH || coderateL != CoderateL || guard != Guard || transmission != Transmission || alpha != Alpha || priority != Priority) { - cString OldParameters = ParametersToString(); + if (source != Source || frequency != Frequency || bandwidth != Bandwidth || modulation != Modulation || hierarchy != Hierarchy || coderateH != CoderateH || coderateL != CoderateL || guard != Guard || transmission != Transmission) { + if (Number()) { + dsyslog("changing transponder data of channel %d from %s:%d:%d:%d:%d:%d:%d:%d:%d to %s:%d:%d:%d:%d:%d:%d:%d:%d", Number(), *cSource::ToString(source), frequency, bandwidth, modulation, hierarchy, coderateH, coderateL, guard, transmission, *cSource::ToString(Source), Frequency, Bandwidth, Modulation, Hierarchy, CoderateH, CoderateL, Guard, Transmission); + modification |= CHANNELMOD_TRANSP; + Channels.SetModified(); + } source = Source; frequency = Frequency; bandwidth = Bandwidth; @@ -407,14 +349,7 @@ bool cChannel::SetTerrTransponderData(int Source, int Frequency, int Bandwidth, coderateL = CoderateL; guard = Guard; transmission = Transmission; - alpha = Alpha; - priority = Priority; schedule = NULL; - if (Number()) { - dsyslog("changing transponder data of channel %d from %d:%s:%s to %d:%s:%s", Number(), frequency, *OldParameters, *cSource::ToString(source), Frequency, *ParametersToString(), *cSource::ToString(Source)); - modification |= CHANNELMOD_TRANSP; - Channels.SetModified(); - } } return true; } @@ -662,17 +597,13 @@ cString cChannel::ParametersToString(void) const char *q = buffer; *q = 0; ST(" S ") q += sprintf(q, "%c", polarization); - ST(" T") q += PrintParameter(q, 'A', MapToUser(alpha, AlphaValues)); - ST(" T") q += PrintParameter(q, 'B', MapToUser(bandwidth, BandwidthValues)); + ST("CST") q += PrintParameter(q, 'I', MapToUser(inversion, InversionValues)); ST("CST") q += PrintParameter(q, 'C', MapToUser(coderateH, CoderateValues)); ST(" T") q += PrintParameter(q, 'D', MapToUser(coderateL, CoderateValues)); - ST(" T") q += PrintParameter(q, 'G', MapToUser(guard, GuardValues)); - ST("CST") q += PrintParameter(q, 'I', MapToUser(inversion, InversionValues)); - ST("CST") q += PrintParameter(q, 'M', MapToUser(modulation, ModulationValues)); - ST(" S ") q += PrintParameter(q, 'O', MapToUser(rollOff, RollOffValues)); - ST(" T") q += PrintParameter(q, 'P', MapToUser(priority, PriorityValues)); - ST(" S ") q += PrintParameter(q, 'S', MapToUser(system, SystemValues)); + ST("C T") q += PrintParameter(q, 'M', MapToUser(modulation, ModulationValues)); + ST(" T") q += PrintParameter(q, 'B', MapToUser(bandwidth, BandwidthValues)); ST(" T") q += PrintParameter(q, 'T', MapToUser(transmission, TransmissionValues)); + ST(" T") q += PrintParameter(q, 'G', MapToUser(guard, GuardValues)); ST(" T") q += PrintParameter(q, 'Y', MapToUser(hierarchy, HierarchyValues)); return buffer; } @@ -697,7 +628,6 @@ bool cChannel::StringToParameters(const char *s) { while (s && *s) { switch (toupper(*s)) { - case 'A': s = ParseParameter(s, alpha, AlphaValues); break; case 'B': s = ParseParameter(s, bandwidth, BandwidthValues); break; case 'C': s = ParseParameter(s, coderateH, CoderateValues); break; case 'D': s = ParseParameter(s, coderateL, CoderateValues); break; @@ -706,11 +636,7 @@ bool cChannel::StringToParameters(const char *s) case 'I': s = ParseParameter(s, inversion, InversionValues); break; case 'L': polarization = *s++; break; case 'M': s = ParseParameter(s, modulation, ModulationValues); break; - case 'Z':// for compatibility with the original DVB-S2 patch - may be removed in future versions - case 'O': s = ParseParameter(s, rollOff, RollOffValues); break; - case 'P': s = ParseParameter(s, priority, PriorityValues); break; case 'R': polarization = *s++; break; - case 'S': s = ParseParameter(s, system, SystemValues); break; case 'T': s = ParseParameter(s, transmission, TransmissionValues); break; case 'V': polarization = *s++; break; case 'Y': s = ParseParameter(s, hierarchy, HierarchyValues); break; diff --git a/channels.h b/channels.h index e6986784..c3073d1c 100644 --- a/channels.h +++ b/channels.h @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: channels.h 1.46 2008/01/26 16:04:26 kls Exp $ + * $Id: channels.h 1.47 2008/02/08 13:48:31 kls Exp $ */ #ifndef __CHANNELS_H @@ -50,10 +50,10 @@ struct tChannelParameterMap { int userValue; int driverValue; - const char *userString; }; -int MapToUser(int Value, const tChannelParameterMap *Map, const char **String = NULL); +//XXX into cChannel??? +int MapToUser(int Value, const tChannelParameterMap *Map); int MapToDriver(int Value, const tChannelParameterMap *Map); int UserIndex(int Value, const tChannelParameterMap *Map); int DriverIndex(int Value, const tChannelParameterMap *Map); @@ -62,13 +62,9 @@ extern const tChannelParameterMap InversionValues[]; extern const tChannelParameterMap BandwidthValues[]; extern const tChannelParameterMap CoderateValues[]; extern const tChannelParameterMap ModulationValues[]; -extern const tChannelParameterMap SystemValues[]; extern const tChannelParameterMap TransmissionValues[]; extern const tChannelParameterMap GuardValues[]; extern const tChannelParameterMap HierarchyValues[]; -extern const tChannelParameterMap AlphaValues[]; -extern const tChannelParameterMap PriorityValues[]; -extern const tChannelParameterMap RollOffValues[]; struct tChannelID { private: @@ -144,13 +140,9 @@ private: int coderateH; int coderateL; int modulation; - int system; int transmission; int guard; int hierarchy; - int alpha; - int priority; - int rollOff; int __EndData__; int modification; mutable const cSchedule *schedule; @@ -202,13 +194,9 @@ public: int CoderateH(void) const { return coderateH; } int CoderateL(void) const { return coderateL; } int Modulation(void) const { return modulation; } - int System(void) const { return system; } int Transmission(void) const { return transmission; } int Guard(void) const { return guard; } int Hierarchy(void) const { return hierarchy; } - int Alpha(void) const { return alpha; } - int Priority(void) const { return priority; } - int RollOff(void) const { return rollOff; } const cLinkChannels* LinkChannels(void) const { return linkChannels; } const cChannel *RefChannel(void) const { return refChannel; } bool IsCable(void) const { return cSource::IsCable(source); } @@ -218,9 +206,9 @@ public: bool HasTimer(void) const; int Modification(int Mask = CHANNELMOD_ALL); void CopyTransponderData(const cChannel *Channel); - bool SetSatTransponderData(int Source, int Frequency, char Polarization, int Srate, int CoderateH, int Modulation, int System, int RollOff); + bool SetSatTransponderData(int Source, int Frequency, char Polarization, int Srate, int CoderateH); bool SetCableTransponderData(int Source, int Frequency, int Modulation, int Srate, int CoderateH); - bool SetTerrTransponderData(int Source, int Frequency, int Bandwidth, int Modulation, int Hierarchy, int CodeRateH, int CodeRateL, int Guard, int Transmission, int Alpha, int Priority); + bool SetTerrTransponderData(int Source, int Frequency, int Bandwidth, int Modulation, int Hierarchy, int CodeRateH, int CodeRateL, int Guard, int Transmission); void SetId(int Nid, int Tid, int Sid, int Rid = 0); void SetName(const char *Name, const char *ShortName, const char *Provider); void SetPortalName(const char *PortalName); diff --git a/config.h b/config.h index e0a0284e..3a25b7b1 100644 --- a/config.h +++ b/config.h @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: config.h 1.304 2008/01/19 12:08:29 kls Exp $ + * $Id: config.h 1.305 2008/02/05 15:35:11 kls Exp $ */ #ifndef __CONFIG_H @@ -22,13 +22,13 @@ // VDR's own version number: -#define VDRVERSION "1.5.14" -#define VDRVERSNUM 10514 // Version * 10000 + Major * 100 + Minor +#define VDRVERSION "1.5.15" +#define VDRVERSNUM 10515 // Version * 10000 + Major * 100 + Minor // The plugin API's version number: -#define APIVERSION "1.5.14" -#define APIVERSNUM 10514 // Version * 10000 + Major * 100 + Minor +#define APIVERSION "1.5.15" +#define APIVERSNUM 10515 // Version * 10000 + Major * 100 + Minor // When loading plugins, VDR searches them by their APIVERSION, which // may be smaller than VDRVERSION in case there have been no changes to diff --git a/device.c b/device.c index e1c654d1..3dfdf6b3 100644 --- a/device.c +++ b/device.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: device.c 1.149 2008/01/27 10:40:46 kls Exp $ + * $Id: device.c 1.150 2008/02/08 13:48:31 kls Exp $ */ #include "device.h" @@ -359,21 +359,6 @@ cDevice *cDevice::GetDevice(int Index) return (0 <= Index && Index < numDevices) ? device[Index] : NULL; } -static int GetClippedNumProvidedSystems(int AvailableBits, cDevice *Device) -{ - int MaxNumProvidedSystems = 1 << AvailableBits; - int NumProvidedSystems = Device->NumProvidedSystems(); - if (NumProvidedSystems > MaxNumProvidedSystems) { - esyslog("ERROR: device %d supports %d modulation systems but cDevice::GetDevice() currently only supports %d delivery systems which should be fixed", Device->CardIndex() + 1, NumProvidedSystems, MaxNumProvidedSystems); - NumProvidedSystems = MaxNumProvidedSystems; - } - else if (NumProvidedSystems <= 0) { - esyslog("ERROR: device %d reported an invalid number (%d) of supported delivery systems - assuming 1", Device->CardIndex() + 1, NumProvidedSystems); - NumProvidedSystems = 1; - } - return NumProvidedSystems; -} - cDevice *cDevice::GetDevice(const cChannel *Channel, int Priority, bool LiveView) { // Collect the current priorities of all CAM slots that can decrypt the channel: @@ -423,7 +408,6 @@ cDevice *cDevice::GetDevice(const cChannel *Channel, int Priority, bool LiveView imp <<= 1; imp |= LiveView ? !device[i]->IsPrimaryDevice() || ndr : 0; // prefer the primary device for live viewing if we don't need to detach existing receivers imp <<= 1; imp |= !device[i]->Receiving() && (device[i] != cTransferControl::ReceiverDevice() || device[i]->IsPrimaryDevice()) || ndr; // use receiving devices if we don't need to detach existing receivers, but avoid primary device in local transfer mode imp <<= 1; imp |= device[i]->Receiving(); // avoid devices that are receiving - imp <<= 2; imp |= GetClippedNumProvidedSystems(2, device[i]) - 1; // avoid cards which support multiple delivery systems imp <<= 1; imp |= device[i] == cTransferControl::ReceiverDevice(); // avoid the Transfer Mode receiver device imp <<= 8; imp |= min(max(device[i]->Priority() + MAXPRIORITY, 0), 0xFF); // use the device with the lowest priority (+MAXPRIORITY to assure that values -99..99 can be used) imp <<= 8; imp |= min(max((NumUsableSlots ? SlotPriority[j] : 0) + MAXPRIORITY, 0), 0xFF); // use the CAM slot with the lowest priority (+MAXPRIORITY to assure that values -99..99 can be used) @@ -712,11 +696,6 @@ bool cDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Needs return false; } -int cDevice::NumProvidedSystems(void) const -{ - return 0; -} - bool cDevice::IsTunedToTransponder(const cChannel *Channel) { return false; diff --git a/device.h b/device.h index 5f53d1a2..34e6771e 100644 --- a/device.h +++ b/device.h @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: device.h 1.87 2008/01/27 10:35:18 kls Exp $ + * $Id: device.h 1.88 2008/02/08 13:48:31 kls Exp $ */ #ifndef __DEVICE_H @@ -224,12 +224,6 @@ public: ///< function itself actually returns true. ///< The default implementation always returns false, so a derived cDevice ///< class that can provide channels must implement this function. - virtual int NumProvidedSystems(void) const; - ///< Returns the number of individual "delivery systems" this device provides. - ///< The default implementation returns 0, so any derived class that can - ///< actually provide channels must implement this function. - ///< The result of this function is used when selecting a device, in order - ///< to avoid devices that provide more than one system. virtual bool IsTunedToTransponder(const cChannel *Channel); ///< Returns true if this device is currently tuned to the given Channel's ///< transponder. diff --git a/dvbdevice.c b/dvbdevice.c index 5680cbb2..a39a4d24 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 1.168 2008/01/27 14:35:54 kls Exp $ + * $Id: dvbdevice.c 1.169 2008/02/08 13:48:31 kls Exp $ */ #include "dvbdevice.h" @@ -76,7 +76,7 @@ private: int tuneTimeout; int lockTimeout; time_t lastTimeoutReport; - dvbfe_delsys frontendType; + fe_type_t frontendType; cChannel channel; const char *diseqcCommands; eTunerStatus tunerStatus; @@ -87,14 +87,14 @@ private: bool SetFrontend(void); virtual void Action(void); public: - cDvbTuner(int Fd_Frontend, int CardIndex, dvbfe_delsys FrontendType); + cDvbTuner(int Fd_Frontend, int CardIndex, fe_type_t FrontendType); virtual ~cDvbTuner(); bool IsTunedTo(const cChannel *Channel) const; void Set(const cChannel *Channel, bool Tune); bool Locked(int TimeoutMs = 0); }; -cDvbTuner::cDvbTuner(int Fd_Frontend, int CardIndex, dvbfe_delsys FrontendType) +cDvbTuner::cDvbTuner(int Fd_Frontend, int CardIndex, fe_type_t FrontendType) { fd_frontend = Fd_Frontend; cardIndex = CardIndex; @@ -104,7 +104,7 @@ cDvbTuner::cDvbTuner(int Fd_Frontend, int CardIndex, dvbfe_delsys FrontendType) lastTimeoutReport = 0; diseqcCommands = NULL; tunerStatus = tsIdle; - if (frontendType & (DVBFE_DELSYS_DVBS | DVBFE_DELSYS_DVBS2)) + if (frontendType == FE_QPSK) CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, SEC_VOLTAGE_13)); // must explicitly turn on LNB power SetDescription("tuner on device %d", cardIndex + 1); Start(); @@ -120,26 +120,7 @@ cDvbTuner::~cDvbTuner() bool cDvbTuner::IsTunedTo(const cChannel *Channel) const { - if (tunerStatus == tsIdle) - return false; // not tuned to - if (channel.Source() != Channel->Source() || channel.Transponder() != Channel->Transponder()) - return false; // sufficient mismatch - char Type = **cSource::ToString(Channel->Source()); -#define ST(s, p) if (strchr(s, Type)) if (channel.p() != Channel->p()) return false; - // Polarization is already checked as part of the Transponder. - ST(" T", Alpha); - ST(" T", Bandwidth); - ST("CST", CoderateH); - ST(" T", CoderateL); - ST(" T", Guard); - ST("CST", Inversion); - ST("CST", Modulation); - ST(" S ", RollOff); - ST(" T", Priority); - ST(" S ", System); - ST(" T", Transmission); - ST(" T", Hierarchy); - return true; + return tunerStatus != tsIdle && channel.Source() == Channel->Source() && channel.Transponder() == Channel->Transponder(); } void cDvbTuner::Set(const cChannel *Channel, bool Tune) @@ -192,126 +173,114 @@ static unsigned int FrequencyToHz(unsigned int f) bool cDvbTuner::SetFrontend(void) { - dvbfe_params Frontend; + dvb_frontend_parameters Frontend; + memset(&Frontend, 0, sizeof(Frontend)); - if (frontendType & (DVBFE_DELSYS_DVBS | DVBFE_DELSYS_DVBS2)) { - unsigned int frequency = channel.Frequency(); - if (Setup.DiSEqC) { - cDiseqc *diseqc = Diseqcs.Get(channel.Source(), channel.Frequency(), channel.Polarization()); - if (diseqc) { - if (diseqc->Commands() && (!diseqcCommands || strcmp(diseqcCommands, diseqc->Commands()) != 0)) { - cDiseqc::eDiseqcActions da; - for (char *CurrentAction = NULL; (da = diseqc->Execute(&CurrentAction)) != cDiseqc::daNone; ) { - switch (da) { - case cDiseqc::daNone: break; - case cDiseqc::daToneOff: CHECK(ioctl(fd_frontend, FE_SET_TONE, SEC_TONE_OFF)); break; - case cDiseqc::daToneOn: CHECK(ioctl(fd_frontend, FE_SET_TONE, SEC_TONE_ON)); break; - case cDiseqc::daVoltage13: CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, SEC_VOLTAGE_13)); break; - case cDiseqc::daVoltage18: CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, SEC_VOLTAGE_18)); break; - case cDiseqc::daMiniA: CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_BURST, SEC_MINI_A)); break; - case cDiseqc::daMiniB: CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_BURST, SEC_MINI_B)); break; - case cDiseqc::daCodes: { - int n = 0; - uchar *codes = diseqc->Codes(n); - if (codes) { - struct dvb_diseqc_master_cmd cmd; - memcpy(cmd.msg, codes, min(n, int(sizeof(cmd.msg)))); - cmd.msg_len = n; - CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_MASTER_CMD, &cmd)); - } - } - break; - } + switch (frontendType) { + case FE_QPSK: { // DVB-S + + unsigned int frequency = channel.Frequency(); + + if (Setup.DiSEqC) { + cDiseqc *diseqc = Diseqcs.Get(channel.Source(), channel.Frequency(), channel.Polarization()); + if (diseqc) { + if (diseqc->Commands() && (!diseqcCommands || strcmp(diseqcCommands, diseqc->Commands()) != 0)) { + cDiseqc::eDiseqcActions da; + for (char *CurrentAction = NULL; (da = diseqc->Execute(&CurrentAction)) != cDiseqc::daNone; ) { + switch (da) { + case cDiseqc::daNone: break; + case cDiseqc::daToneOff: CHECK(ioctl(fd_frontend, FE_SET_TONE, SEC_TONE_OFF)); break; + case cDiseqc::daToneOn: CHECK(ioctl(fd_frontend, FE_SET_TONE, SEC_TONE_ON)); break; + case cDiseqc::daVoltage13: CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, SEC_VOLTAGE_13)); break; + case cDiseqc::daVoltage18: CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, SEC_VOLTAGE_18)); break; + case cDiseqc::daMiniA: CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_BURST, SEC_MINI_A)); break; + case cDiseqc::daMiniB: CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_BURST, SEC_MINI_B)); break; + case cDiseqc::daCodes: { + int n = 0; + uchar *codes = diseqc->Codes(n); + if (codes) { + struct dvb_diseqc_master_cmd cmd; + memcpy(cmd.msg, codes, min(n, int(sizeof(cmd.msg)))); + cmd.msg_len = n; + CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_MASTER_CMD, &cmd)); + } + } + break; + } + } + diseqcCommands = diseqc->Commands(); } - diseqcCommands = diseqc->Commands(); - } - frequency -= diseqc->Lof(); - } - else { - esyslog("ERROR: no DiSEqC parameters found for channel %d", channel.Number()); - return false; - } - } - else { - int tone = SEC_TONE_OFF; - if (frequency < (unsigned int)Setup.LnbSLOF) { - frequency -= Setup.LnbFrequLo; - tone = SEC_TONE_OFF; - } - else { - frequency -= Setup.LnbFrequHi; - tone = SEC_TONE_ON; - } - int volt = (channel.Polarization() == 'v' || channel.Polarization() == 'V' || channel.Polarization() == 'r' || channel.Polarization() == 'R') ? SEC_VOLTAGE_13 : SEC_VOLTAGE_18; - CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, volt)); - CHECK(ioctl(fd_frontend, FE_SET_TONE, tone)); - } - frequency = abs(frequency); // Allow for C-band, where the frequency is less than the LOF + frequency -= diseqc->Lof(); + } + else { + esyslog("ERROR: no DiSEqC parameters found for channel %d", channel.Number()); + return false; + } + } + else { + int tone = SEC_TONE_OFF; - Frontend.delivery = dvbfe_delsys(channel.System()); - Frontend.frequency = frequency * 1000UL; - Frontend.inversion = fe_spectral_inversion_t(channel.Inversion()); - if (Frontend.delivery == DVBFE_DELSYS_DVBS) { - Frontend.delsys.dvbs.modulation = dvbfe_modulation(channel.Modulation()); - Frontend.delsys.dvbs.symbol_rate = channel.Srate() * 1000UL; - Frontend.delsys.dvbs.fec = dvbfe_fec(channel.CoderateH()); - } - else { - Frontend.delsys.dvbs2.modulation = dvbfe_modulation(channel.Modulation()); - Frontend.delsys.dvbs2.symbol_rate = channel.Srate() * 1000UL; - Frontend.delsys.dvbs2.fec = dvbfe_fec(channel.CoderateH()); - Frontend.delsys.dvbs2.rolloff = dvbfe_rolloff(channel.RollOff()); - } + if (frequency < (unsigned int)Setup.LnbSLOF) { + frequency -= Setup.LnbFrequLo; + tone = SEC_TONE_OFF; + } + else { + frequency -= Setup.LnbFrequHi; + tone = SEC_TONE_ON; + } + int volt = (channel.Polarization() == 'v' || channel.Polarization() == 'V' || channel.Polarization() == 'r' || channel.Polarization() == 'R') ? SEC_VOLTAGE_13 : SEC_VOLTAGE_18; + CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, volt)); + CHECK(ioctl(fd_frontend, FE_SET_TONE, tone)); + } - tuneTimeout = DVBS_TUNE_TIMEOUT; - lockTimeout = DVBS_LOCK_TIMEOUT; + frequency = abs(frequency); // Allow for C-band, where the frequency is less than the LOF + Frontend.frequency = frequency * 1000UL; + Frontend.inversion = fe_spectral_inversion_t(channel.Inversion()); + Frontend.u.qpsk.symbol_rate = channel.Srate() * 1000UL; + Frontend.u.qpsk.fec_inner = fe_code_rate_t(channel.CoderateH()); - dvbfe_info feinfo; - feinfo.delivery = Frontend.delivery; - CHECK(ioctl(fd_frontend, DVBFE_GET_INFO, &feinfo)); //switch system - } - else if (frontendType & DVBFE_DELSYS_DVBC) { - Frontend.delivery = DVBFE_DELSYS_DVBC; - Frontend.frequency = FrequencyToHz(channel.Frequency()); - Frontend.inversion = fe_spectral_inversion_t(channel.Inversion()); - Frontend.delsys.dvbc.symbol_rate = channel.Srate() * 1000UL; - Frontend.delsys.dvbc.fec = dvbfe_fec(channel.CoderateH()); - Frontend.delsys.dvbc.modulation = dvbfe_modulation(channel.Modulation()); + tuneTimeout = DVBS_TUNE_TIMEOUT; + lockTimeout = DVBS_LOCK_TIMEOUT; + } + break; + case FE_QAM: { // DVB-C - tuneTimeout = DVBC_TUNE_TIMEOUT; - lockTimeout = DVBC_LOCK_TIMEOUT; + // Frequency and symbol rate: - dvbfe_info feinfo; - feinfo.delivery = Frontend.delivery; - CHECK(ioctl(fd_frontend, DVBFE_GET_INFO, &feinfo)); //switch system - } - else if (frontendType & DVBFE_DELSYS_DVBT) { - Frontend.delivery = DVBFE_DELSYS_DVBT; - Frontend.frequency = FrequencyToHz(channel.Frequency()); - Frontend.inversion = fe_spectral_inversion_t(channel.Inversion()); - Frontend.delsys.dvbt.bandwidth = dvbfe_bandwidth(channel.Bandwidth()); - Frontend.delsys.dvbt.code_rate_HP = dvbfe_fec(channel.CoderateH()); - Frontend.delsys.dvbt.code_rate_LP = dvbfe_fec(channel.CoderateL()); - Frontend.delsys.dvbt.constellation = dvbfe_modulation(channel.Modulation()); - Frontend.delsys.dvbt.transmission_mode = dvbfe_transmission_mode(channel.Transmission()); - Frontend.delsys.dvbt.guard_interval = dvbfe_guard_interval(channel.Guard()); - Frontend.delsys.dvbt.hierarchy = dvbfe_hierarchy(channel.Hierarchy()); - Frontend.delsys.dvbt.alpha = dvbfe_alpha(channel.Alpha()); - Frontend.delsys.dvbt.priority = dvbfe_stream_priority(channel.Priority()); + Frontend.frequency = FrequencyToHz(channel.Frequency()); + Frontend.inversion = fe_spectral_inversion_t(channel.Inversion()); + Frontend.u.qam.symbol_rate = channel.Srate() * 1000UL; + Frontend.u.qam.fec_inner = fe_code_rate_t(channel.CoderateH()); + Frontend.u.qam.modulation = fe_modulation_t(channel.Modulation()); - tuneTimeout = DVBT_TUNE_TIMEOUT; - lockTimeout = DVBT_LOCK_TIMEOUT; + tuneTimeout = DVBC_TUNE_TIMEOUT; + lockTimeout = DVBC_LOCK_TIMEOUT; + } + break; + case FE_OFDM: { // DVB-T - dvbfe_info feinfo; - feinfo.delivery = Frontend.delivery; - CHECK(ioctl(fd_frontend, DVBFE_GET_INFO, &feinfo)); //switch system - } - else { - esyslog("ERROR: attempt to set channel with unknown DVB frontend type"); - return false; + // Frequency and OFDM paramaters: + + Frontend.frequency = FrequencyToHz(channel.Frequency()); + Frontend.inversion = fe_spectral_inversion_t(channel.Inversion()); + Frontend.u.ofdm.bandwidth = fe_bandwidth_t(channel.Bandwidth()); + Frontend.u.ofdm.code_rate_HP = fe_code_rate_t(channel.CoderateH()); + Frontend.u.ofdm.code_rate_LP = fe_code_rate_t(channel.CoderateL()); + Frontend.u.ofdm.constellation = fe_modulation_t(channel.Modulation()); + Frontend.u.ofdm.transmission_mode = fe_transmit_mode_t(channel.Transmission()); + Frontend.u.ofdm.guard_interval = fe_guard_interval_t(channel.Guard()); + Frontend.u.ofdm.hierarchy_information = fe_hierarchy_t(channel.Hierarchy()); + + tuneTimeout = DVBT_TUNE_TIMEOUT; + lockTimeout = DVBT_LOCK_TIMEOUT; + } + break; + default: + esyslog("ERROR: attempt to set channel with unknown DVB frontend type"); + return false; } - if (ioctl(fd_frontend, DVBFE_SET_PARAMS, &Frontend) < 0) { + if (ioctl(fd_frontend, FE_SET_FRONTEND, &Frontend) < 0) { esyslog("ERROR: frontend %d: %m", cardIndex); return false; } @@ -382,23 +351,11 @@ void cDvbTuner::Action(void) int cDvbDevice::devVideoOffset = -1; int cDvbDevice::setTransferModeForDolbyDigital = 1; -const char *DeliverySystems[] = { - "DVBS", - "DSS", - "DVBS2", - "DVBC", - "DVBT", - "DVBH", - "ATSC", - NULL - }; - cDvbDevice::cDvbDevice(int n) { ciAdapter = NULL; dvbTuner = NULL; - frontendType = DVBFE_DELSYS_DUMMY; - numProvidedSystems = 0; + frontendType = fe_type_t(-1); // don't know how else to initialize this - there is no FE_UNKNOWN spuDecoder = NULL; digitalAudio = false; playMode = pmNone; @@ -460,22 +417,9 @@ cDvbDevice::cDvbDevice(int n) // We only check the devices that must be present - the others will be checked before accessing them://XXX if (fd_frontend >= 0) { - if (ioctl(fd_frontend, DVBFE_GET_DELSYS, &frontendType) >= 0) { - const char **DeliverySystem = DeliverySystems; - cString ds; - for (int i = 0; i < 32; i++) { - if (frontendType & (1u << i)) { - numProvidedSystems++; - if (*DeliverySystem) - ds = cString::sprintf("%s %s", *ds ? *ds : "", *DeliverySystem); - else - esyslog("ERROR: unknown delivery system %d", i); - } - if (*DeliverySystem) - DeliverySystem++; - } - if (*ds) - isyslog("device %d provides:%s", CardIndex() + 1, *ds); + dvb_frontend_info feinfo; + if (ioctl(fd_frontend, FE_GET_INFO, &feinfo) >= 0) { + frontendType = feinfo.type; dvbTuner = new cDvbTuner(fd_frontend, CardIndex(), frontendType); } else @@ -799,20 +743,14 @@ bool cDvbDevice::ProvidesSource(int Source) const { int type = Source & cSource::st_Mask; return type == cSource::stNone - || type == cSource::stCable && (frontendType & DVBFE_DELSYS_DVBC) - || type == cSource::stSat && (frontendType & (DVBFE_DELSYS_DVBS | DVBFE_DELSYS_DVBS2)) - || type == cSource::stTerr && (frontendType & DVBFE_DELSYS_DVBT); + || type == cSource::stCable && frontendType == FE_QAM + || type == cSource::stSat && frontendType == FE_QPSK + || type == cSource::stTerr && frontendType == FE_OFDM; } bool cDvbDevice::ProvidesTransponder(const cChannel *Channel) const { - if (!ProvidesSource(Channel->Source())) - return false; // doesn't provide source - if (!cSource::IsSat(Channel->Source())) - return true; // source is sufficient for non sat - if (!(frontendType & Channel->System())) - return false; // requires modulation system which frontend doesn't provide - return !Setup.DiSEqC || Diseqcs.Get(Channel->Source(), Channel->Frequency(), Channel->Polarization()); + return ProvidesSource(Channel->Source()) && (!cSource::IsSat(Channel->Source()) || !Setup.DiSEqC || Diseqcs.Get(Channel->Source(), Channel->Frequency(), Channel->Polarization())); } bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *NeedsDetachReceivers) const @@ -821,7 +759,7 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne bool hasPriority = Priority < 0 || Priority > this->Priority(); bool needsDetachReceivers = false; - if (ProvidesTransponder(Channel)) { + if (ProvidesSource(Channel->Source())) { result = hasPriority; if (Priority >= 0 && Receiving(true)) { if (dvbTuner->IsTunedTo(Channel)) { @@ -853,11 +791,6 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne return result; } -int cDvbDevice::NumProvidedSystems(void) const -{ - return numProvidedSystems; -} - bool cDvbDevice::IsTunedToTransponder(const cChannel *Channel) { return dvbTuner->IsTunedTo(Channel); diff --git a/dvbdevice.h b/dvbdevice.h index eca00dd6..7bd3e545 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 1.46 2008/01/27 10:21:02 kls Exp $ + * $Id: dvbdevice.h 1.47 2008/02/08 13:48:31 kls Exp $ */ #ifndef __DVBDEVICE_H @@ -15,8 +15,8 @@ #include "device.h" #include "dvbspu.h" -#if DVB_API_VERSION != 3 || DVB_API_VERSION_MINOR != 3 -#error VDR requires Linux DVB driver API version 3.3! +#if DVB_API_VERSION != 3 +#error VDR requires Linux DVB driver API version 3! #endif #define MAXDVBDEVICES 8 @@ -35,8 +35,7 @@ public: ///< Must be called before accessing any DVB functions. ///< \return True if any devices are available. private: - dvbfe_delsys frontendType; - int numProvidedSystems; + fe_type_t frontendType; int fd_osd, fd_audio, fd_video, fd_dvr, fd_stc, fd_ca; protected: virtual void MakePrimaryDevice(bool On); @@ -67,7 +66,6 @@ public: virtual bool ProvidesSource(int Source) const; virtual bool ProvidesTransponder(const cChannel *Channel) const; virtual bool ProvidesChannel(const cChannel *Channel, int Priority = -1, bool *NeedsDetachReceivers = NULL) const; - virtual int NumProvidedSystems(void) const; virtual bool IsTunedToTransponder(const cChannel *Channel); protected: virtual bool SetChannelDevice(const cChannel *Channel, bool LiveView); diff --git a/menu.c b/menu.c index 4499b5f0..62545cfe 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 1.470 2008/01/26 16:29:05 kls Exp $ + * $Id: menu.c 1.471 2008/02/08 13:48:31 kls Exp $ */ #include "menu.h" @@ -148,6 +148,70 @@ eOSState cMenuEditSrcItem::ProcessKey(eKeys Key) return state; } +// --- cMenuEditMapItem ------------------------------------------------------ + +class cMenuEditMapItem : public cMenuEditItem { +protected: + int *value; + const tChannelParameterMap *map; + const char *zeroString; + virtual void Set(void); +public: + cMenuEditMapItem(const char *Name, int *Value, const tChannelParameterMap *Map, const char *ZeroString = NULL); + virtual eOSState ProcessKey(eKeys Key); + }; + +cMenuEditMapItem::cMenuEditMapItem(const char *Name, int *Value, const tChannelParameterMap *Map, const char *ZeroString) +:cMenuEditItem(Name) +{ + value = Value; + map = Map; + zeroString = ZeroString; + Set(); +} + +void cMenuEditMapItem::Set(void) +{ + int n = MapToUser(*value, map); + if (n == 999) + SetValue(tr("auto")); + else if (n == 0 && zeroString) + SetValue(zeroString); + else if (n >= 0) { + char buf[16]; + snprintf(buf, sizeof(buf), "%d", n); + SetValue(buf); + } + else + SetValue("???"); +} + +eOSState cMenuEditMapItem::ProcessKey(eKeys Key) +{ + eOSState state = cMenuEditItem::ProcessKey(Key); + + if (state == osUnknown) { + int newValue = *value; + int n = DriverIndex(*value, map); + if (NORMALKEY(Key) == kLeft) { // TODO might want to increase the delta if repeated quickly? + if (n-- > 0) + newValue = map[n].driverValue; + } + else if (NORMALKEY(Key) == kRight) { + if (map[++n].userValue >= 0) + newValue = map[n].driverValue; + } + else + return state; + if (newValue != *value) { + *value = newValue; + Set(); + } + state = osContinue; + } + return state; +} + // --- cMenuEditChannel ------------------------------------------------------ class cMenuEditChannel : public cOsdMenu { @@ -208,19 +272,15 @@ void cMenuEditChannel::Setup(void) XXX*/ // Parameters for specific types of sources: ST(" S ") Add(new cMenuEditChrItem( tr("Polarization"), &data.polarization, "hvlr")); - ST(" S ") Add(new cMenuEditMapItem( tr("System"), &data.system, SystemValues)); ST("CS ") Add(new cMenuEditIntItem( tr("Srate"), &data.srate)); - ST("CST") Add(new cMenuEditMapItem( tr("Inversion"), &data.inversion, InversionValues)); - ST("CST") Add(new cMenuEditMapItem( tr("CoderateH"), &data.coderateH, CoderateValues)); - ST(" T") Add(new cMenuEditMapItem( tr("CoderateL"), &data.coderateL, CoderateValues)); - ST("CST") Add(new cMenuEditMapItem( tr("Modulation"), &data.modulation, ModulationValues)); + ST("CST") Add(new cMenuEditMapItem( tr("Inversion"), &data.inversion, InversionValues, tr("off"))); + ST("CST") Add(new cMenuEditMapItem( tr("CoderateH"), &data.coderateH, CoderateValues, tr("none"))); + ST(" T") Add(new cMenuEditMapItem( tr("CoderateL"), &data.coderateL, CoderateValues, tr("none"))); + ST("C T") Add(new cMenuEditMapItem( tr("Modulation"), &data.modulation, ModulationValues, "QPSK")); ST(" T") Add(new cMenuEditMapItem( tr("Bandwidth"), &data.bandwidth, BandwidthValues)); ST(" T") Add(new cMenuEditMapItem( tr("Transmission"), &data.transmission, TransmissionValues)); ST(" T") Add(new cMenuEditMapItem( tr("Guard"), &data.guard, GuardValues)); - ST(" T") Add(new cMenuEditMapItem( tr("Hierarchy"), &data.hierarchy, HierarchyValues)); - ST(" T") Add(new cMenuEditMapItem( tr("Alpha"), &data.alpha, AlphaValues)); - ST(" T") Add(new cMenuEditMapItem( tr("Priority"), &data.priority, PriorityValues)); - ST(" S ") Add(new cMenuEditMapItem( tr("Rolloff"), &data.rollOff, RollOffValues)); + ST(" T") Add(new cMenuEditMapItem( tr("Hierarchy"), &data.hierarchy, HierarchyValues, tr("none"))); SetCurrent(Get(current)); Display(); diff --git a/menuitems.c b/menuitems.c index 15f729bd..44c9f892 100644 --- a/menuitems.c +++ b/menuitems.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: menuitems.c 1.56 2008/01/26 16:07:07 kls Exp $ + * $Id: menuitems.c 1.57 2008/02/08 13:48:31 kls Exp $ */ #include "menuitems.h" @@ -937,64 +937,6 @@ eOSState cMenuEditTimeItem::ProcessKey(eKeys Key) return state; } -// --- cMenuEditMapItem ------------------------------------------------------ - -cMenuEditMapItem::cMenuEditMapItem(const char *Name, int *Value, const tChannelParameterMap *Map, const char *ZeroString) -:cMenuEditItem(Name) -{ - value = Value; - map = Map; - zeroString = ZeroString; - Set(); -} - -void cMenuEditMapItem::Set(void) -{ - const char *s = NULL; - int n = MapToUser(*value, map, &s); - if (n == 999) - SetValue(tr("auto")); - else if (n == 0 && zeroString) - SetValue(zeroString); - else if (n >= 0) { - if (s) - SetValue(s); - else { - char buf[16]; - snprintf(buf, sizeof(buf), "%d", n); - SetValue(buf); - } - } - else - SetValue("???"); -} - -eOSState cMenuEditMapItem::ProcessKey(eKeys Key) -{ - eOSState state = cMenuEditItem::ProcessKey(Key); - - if (state == osUnknown) { - int newValue = *value; - int n = DriverIndex(*value, map); - if (NORMALKEY(Key) == kLeft) { // TODO might want to increase the delta if repeated quickly? - if (n-- > 0) - newValue = map[n].driverValue; - } - else if (NORMALKEY(Key) == kRight) { - if (map[++n].userValue >= 0) - newValue = map[n].driverValue; - } - else - return state; - if (newValue != *value) { - *value = newValue; - Set(); - } - state = osContinue; - } - return state; -} - // --- cMenuSetupPage -------------------------------------------------------- cMenuSetupPage::cMenuSetupPage(void) diff --git a/menuitems.h b/menuitems.h index 0fe4713c..97a59b57 100644 --- a/menuitems.h +++ b/menuitems.h @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: menuitems.h 1.23 2008/01/26 15:52:53 kls Exp $ + * $Id: menuitems.h 1.24 2008/02/08 13:48:31 kls Exp $ */ #ifndef __MENUITEMS_H @@ -159,17 +159,6 @@ public: virtual eOSState ProcessKey(eKeys Key); }; -class cMenuEditMapItem : public cMenuEditItem { -protected: - int *value; - const tChannelParameterMap *map; - const char *zeroString; - virtual void Set(void); -public: - cMenuEditMapItem(const char *Name, int *Value, const tChannelParameterMap *Map, const char *ZeroString = NULL); - virtual eOSState ProcessKey(eKeys Key); - }; - class cPlugin; class cMenuSetupPage : public cOsdMenu { diff --git a/nit.c b/nit.c index 32ac18a2..a2ff2d7d 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 1.17 2008/01/26 15:08:01 kls Exp $ + * $Id: nit.c 1.18 2008/02/08 13:48:31 kls Exp $ */ #include "nit.h" @@ -127,13 +127,8 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length int Frequency = Frequencies[0] = BCD2INT(sd->getFrequency()) / 100; static char Polarizations[] = { 'h', 'v', 'l', 'r' }; char Polarization = Polarizations[sd->getPolarization()]; - static int CodeRates[] = { DVBFE_FEC_NONE, DVBFE_FEC_1_2, DVBFE_FEC_2_3, DVBFE_FEC_3_4, DVBFE_FEC_5_6, DVBFE_FEC_7_8, DVBFE_FEC_8_9, DVBFE_FEC_3_5, DVBFE_FEC_4_5, DVBFE_FEC_9_10, DVBFE_FEC_AUTO, DVBFE_FEC_AUTO, DVBFE_FEC_AUTO, DVBFE_FEC_AUTO, DVBFE_FEC_AUTO, DVBFE_FEC_NONE }; + static int CodeRates[] = { FEC_NONE, FEC_1_2, FEC_2_3, FEC_3_4, FEC_5_6, FEC_7_8, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_NONE }; int CodeRate = CodeRates[sd->getFecInner()]; - static int Modulations[] = { DVBFE_MOD_AUTO, DVBFE_MOD_QPSK, DVBFE_MOD_8PSK, DVBFE_MOD_QAM16 }; - int Modulation = Modulations[sd->getModulationType()]; - int System = sd->getModulationSystem() ? DVBFE_DELSYS_DVBS2 : DVBFE_DELSYS_DVBS; - static int RollOffs[] = { DVBFE_ROLLOFF_35, DVBFE_ROLLOFF_25, DVBFE_ROLLOFF_20, DVBFE_ROLLOFF_UNKNOWN }; - int RollOff = sd->getModulationSystem() ? RollOffs[sd->getRollOff()] : DVBFE_ROLLOFF_UNKNOWN; int SymbolRate = BCD2INT(sd->getSymbolRate()) / 10; if (ThisNIT >= 0) { for (int n = 0; n < NumFrequencies; n++) { @@ -160,14 +155,14 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length } } if (ISTRANSPONDER(cChannel::Transponder(Frequency, Polarization), Transponder())) // only modify channels if we're actually receiving this transponder - Channel->SetSatTransponderData(Source, Frequency, Polarization, SymbolRate, CodeRate, Modulation, System, RollOff); + Channel->SetSatTransponderData(Source, Frequency, Polarization, SymbolRate, CodeRate); } } if (!found) { for (int n = 0; n < NumFrequencies; n++) { cChannel *Channel = new cChannel; Channel->SetId(ts.getOriginalNetworkId(), ts.getTransportStreamId(), 0, 0); - if (Channel->SetSatTransponderData(Source, Frequencies[n], Polarization, SymbolRate, CodeRate, Modulation, System, RollOff)) + if (Channel->SetSatTransponderData(Source, Frequencies[n], Polarization, SymbolRate, CodeRate)) EITScanner.AddTransponder(Channel); else delete Channel; @@ -181,9 +176,9 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length int Source = cSource::FromData(cSource::stCable); int Frequency = Frequencies[0] = BCD2INT(sd->getFrequency()) / 10; //XXX FEC_outer??? - static int CodeRates[] = { DVBFE_FEC_NONE, DVBFE_FEC_1_2, DVBFE_FEC_2_3, DVBFE_FEC_3_4, DVBFE_FEC_5_6, DVBFE_FEC_7_8, DVBFE_FEC_8_9, DVBFE_FEC_3_5, DVBFE_FEC_4_5, DVBFE_FEC_9_10, DVBFE_FEC_AUTO, DVBFE_FEC_AUTO, DVBFE_FEC_AUTO, DVBFE_FEC_AUTO, DVBFE_FEC_AUTO, DVBFE_FEC_NONE }; + static int CodeRates[] = { FEC_NONE, FEC_1_2, FEC_2_3, FEC_3_4, FEC_5_6, FEC_7_8, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_NONE }; int CodeRate = CodeRates[sd->getFecInner()]; - static int Modulations[] = { DVBFE_MOD_NONE, DVBFE_MOD_QAM16, DVBFE_MOD_QAM32, DVBFE_MOD_QAM64, DVBFE_MOD_QAM128, DVBFE_MOD_QAM256, QAM_AUTO }; + static int Modulations[] = { QPSK, QAM_16, QAM_32, QAM_64, QAM_128, QAM_256, QAM_AUTO }; int Modulation = Modulations[min(sd->getModulation(), 6)]; int SymbolRate = BCD2INT(sd->getSymbolRate()) / 10; if (ThisNIT >= 0) { @@ -231,22 +226,19 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length SI::TerrestrialDeliverySystemDescriptor *sd = (SI::TerrestrialDeliverySystemDescriptor *)d; int Source = cSource::FromData(cSource::stTerr); int Frequency = Frequencies[0] = sd->getFrequency() * 10; - static int Bandwidths[] = { DVBFE_BANDWIDTH_8_MHZ, DVBFE_BANDWIDTH_7_MHZ, DVBFE_BANDWIDTH_6_MHZ, DVBFE_BANDWIDTH_5_MHZ, DVBFE_BANDWIDTH_AUTO, DVBFE_BANDWIDTH_AUTO, DVBFE_BANDWIDTH_AUTO, DVBFE_BANDWIDTH_AUTO }; + static int Bandwidths[] = { BANDWIDTH_8_MHZ, BANDWIDTH_7_MHZ, BANDWIDTH_6_MHZ, BANDWIDTH_AUTO, BANDWIDTH_AUTO, BANDWIDTH_AUTO, BANDWIDTH_AUTO, BANDWIDTH_AUTO }; int Bandwidth = Bandwidths[sd->getBandwidth()]; - static int Constellations[] = { DVBFE_MOD_QPSK, DVBFE_MOD_QAM16, DVBFE_MOD_QAM64, DVBFE_MOD_AUTO }; + static int Constellations[] = { QPSK, QAM_16, QAM_64, QAM_AUTO }; int Constellation = Constellations[sd->getConstellation()]; - static int CodeRates[] = { DVBFE_FEC_1_2, DVBFE_FEC_2_3, DVBFE_FEC_3_4, DVBFE_FEC_5_6, DVBFE_FEC_7_8, DVBFE_FEC_AUTO, DVBFE_FEC_AUTO, DVBFE_FEC_AUTO }; + static int Hierarchies[] = { HIERARCHY_NONE, HIERARCHY_1, HIERARCHY_2, HIERARCHY_4, HIERARCHY_AUTO, HIERARCHY_AUTO, HIERARCHY_AUTO, HIERARCHY_AUTO }; + int Hierarchy = Hierarchies[sd->getHierarchy()]; + static int CodeRates[] = { FEC_1_2, FEC_2_3, FEC_3_4, FEC_5_6, FEC_7_8, FEC_AUTO, FEC_AUTO, FEC_AUTO }; int CodeRateHP = CodeRates[sd->getCodeRateHP()]; int CodeRateLP = CodeRates[sd->getCodeRateLP()]; - static int GuardIntervals[] = { DVBFE_GUARD_INTERVAL_1_32, DVBFE_GUARD_INTERVAL_1_16, DVBFE_GUARD_INTERVAL_1_8, DVBFE_GUARD_INTERVAL_1_4 }; + static int GuardIntervals[] = { GUARD_INTERVAL_1_32, GUARD_INTERVAL_1_16, GUARD_INTERVAL_1_8, GUARD_INTERVAL_1_4 }; int GuardInterval = GuardIntervals[sd->getGuardInterval()]; - static int TransmissionModes[] = { DVBFE_TRANSMISSION_MODE_2K, DVBFE_TRANSMISSION_MODE_8K, DVBFE_TRANSMISSION_MODE_4K, DVBFE_TRANSMISSION_MODE_AUTO }; + static int TransmissionModes[] = { TRANSMISSION_MODE_2K, TRANSMISSION_MODE_8K, TRANSMISSION_MODE_AUTO, TRANSMISSION_MODE_AUTO }; int TransmissionMode = TransmissionModes[sd->getTransmissionMode()]; - static int Priorities[] = { DVBFE_STREAM_PRIORITY_LP, DVBFE_STREAM_PRIORITY_HP }; - int Priority = Priorities[sd->getPriority()]; - static int Alphas[] = { 0, DVBFE_ALPHA_1, DVBFE_ALPHA_2, DVBFE_ALPHA_4 }; - int Alpha = Alphas[sd->getHierarchy() & 3]; - int Hierarchy = Alpha ? DVBFE_HIERARCHY_ON : DVBFE_HIERARCHY_OFF; if (ThisNIT >= 0) { for (int n = 0; n < NumFrequencies; n++) { if (ISTRANSPONDER(Frequencies[n] / 1000000, Transponder())) { @@ -272,14 +264,14 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length } } if (ISTRANSPONDER(Frequency / 1000000, Transponder())) // only modify channels if we're actually receiving this transponder - Channel->SetTerrTransponderData(Source, Frequency, Bandwidth, Constellation, Hierarchy, CodeRateHP, CodeRateLP, GuardInterval, TransmissionMode, Alpha, Priority); + Channel->SetTerrTransponderData(Source, Frequency, Bandwidth, Constellation, Hierarchy, CodeRateHP, CodeRateLP, GuardInterval, TransmissionMode); } } if (!found) { for (int n = 0; n < NumFrequencies; n++) { cChannel *Channel = new cChannel; Channel->SetId(ts.getOriginalNetworkId(), ts.getTransportStreamId(), 0, 0); - if (Channel->SetTerrTransponderData(Source, Frequencies[n], Bandwidth, Constellation, Hierarchy, CodeRateHP, CodeRateLP, GuardInterval, TransmissionMode, Alpha, Priority)) + if (Channel->SetTerrTransponderData(Source, Frequencies[n], Bandwidth, Constellation, Hierarchy, CodeRateHP, CodeRateLP, GuardInterval, TransmissionMode)) EITScanner.AddTransponder(Channel); else delete Channel; diff --git a/pat.c b/pat.c index bc84e43d..9b41b16b 100644 --- a/pat.c +++ b/pat.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: pat.c 1.19 2008/01/27 13:53:43 kls Exp $ + * $Id: pat.c 1.20 2008/02/08 13:48:31 kls Exp $ */ #include "pat.h" @@ -343,7 +343,6 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length switch (stream.getStreamType()) { case 1: // STREAMTYPE_11172_VIDEO case 2: // STREAMTYPE_13818_VIDEO -//TODO case 0x1B: // MPEG4 Vpid = stream.getPid(); break; case 3: // STREAMTYPE_11172_AUDIO diff --git a/po/ca_ES.po b/po/ca_ES.po index 90d6ae97..fa5c8470 100644 --- a/po/ca_ES.po +++ b/po/ca_ES.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-27 15:00+0100\n" +"POT-Creation-Date: 2007-11-25 14:59+0100\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n" "Last-Translator: Jordi Vilà \n" "Language-Team: \n" @@ -17,21 +17,6 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -msgid "off" -msgstr "off" - -msgid "on" -msgstr "" - -msgid "none" -msgstr "cap" - -msgid "high" -msgstr "" - -msgid "low" -msgstr "" - msgid "*** Invalid Channel ***" msgstr "*** Canal incorrecte ***" @@ -236,6 +221,9 @@ msgstr "" msgid "encrypted" msgstr "" +msgid "auto" +msgstr "auto" + msgid "Edit channel" msgstr "Editar canal" @@ -284,18 +272,21 @@ msgstr "Sid" msgid "Polarization" msgstr "Polarització" -msgid "System" -msgstr "" - msgid "Srate" msgstr "Srate" msgid "Inversion" msgstr "Inversió" +msgid "off" +msgstr "off" + msgid "CoderateH" msgstr "CoderateH" +msgid "none" +msgstr "cap" + msgid "CoderateL" msgstr "CoderateL" @@ -314,15 +305,6 @@ msgstr "Protegir" msgid "Hierarchy" msgstr "Jerarquia" -msgid "Alpha" -msgstr "" - -msgid "Priority" -msgstr "Prioritat" - -msgid "Rolloff" -msgstr "" - msgid "Channel settings are not unique!" msgstr "Propietats del canal duplicades!" @@ -368,6 +350,9 @@ msgstr "Fi" msgid "VPS" msgstr "" +msgid "Priority" +msgstr "Prioritat" + msgid "Lifetime" msgstr "Durada" @@ -908,9 +893,6 @@ msgstr "Sobrescriure" msgid "Button$Insert" msgstr "Inserir" -msgid "auto" -msgstr "auto" - msgid "Plugin" msgstr "Plugin" diff --git a/po/cs_CZ.po b/po/cs_CZ.po index 812c1fcb..c3ae43cd 100644 --- a/po/cs_CZ.po +++ b/po/cs_CZ.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-27 15:00+0100\n" +"POT-Creation-Date: 2007-11-25 14:59+0100\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n" "Last-Translator: Vladimír Bárta \n" "Language-Team: \n" @@ -15,21 +15,6 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8bit\n" -msgid "off" -msgstr "vyp." - -msgid "on" -msgstr "" - -msgid "none" -msgstr "¾ádný" - -msgid "high" -msgstr "" - -msgid "low" -msgstr "" - msgid "*** Invalid Channel ***" msgstr "*** Neplatný kanál ***" @@ -234,6 +219,9 @@ msgstr "voln msgid "encrypted" msgstr "kódovaný" +msgid "auto" +msgstr "auto" + msgid "Edit channel" msgstr "Editace kanálu" @@ -282,18 +270,21 @@ msgstr "Sid" msgid "Polarization" msgstr "Polarizace" -msgid "System" -msgstr "" - msgid "Srate" msgstr "Srate" msgid "Inversion" msgstr "Inversion" +msgid "off" +msgstr "vyp." + msgid "CoderateH" msgstr "CoderateH" +msgid "none" +msgstr "¾ádný" + msgid "CoderateL" msgstr "CoderateL" @@ -312,15 +303,6 @@ msgstr "Guard" msgid "Hierarchy" msgstr "Hierarchy" -msgid "Alpha" -msgstr "" - -msgid "Priority" -msgstr "Priorita" - -msgid "Rolloff" -msgstr "" - msgid "Channel settings are not unique!" msgstr "Nastavení kanálù nejsou unikátní!" @@ -366,6 +348,9 @@ msgstr "Konec" msgid "VPS" msgstr "VPS" +msgid "Priority" +msgstr "Priorita" + msgid "Lifetime" msgstr "®ivotnost" @@ -906,9 +891,6 @@ msgstr "P msgid "Button$Insert" msgstr "Vlo¾it" -msgid "auto" -msgstr "auto" - msgid "Plugin" msgstr "Modul" diff --git a/po/da_DK.po b/po/da_DK.po index 53b1bee1..e08e7e46 100644 --- a/po/da_DK.po +++ b/po/da_DK.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-27 15:00+0100\n" +"POT-Creation-Date: 2007-11-25 14:59+0100\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n" "Last-Translator: Mogens Elneff \n" "Language-Team: \n" @@ -15,21 +15,6 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-15\n" "Content-Transfer-Encoding: 8bit\n" -msgid "off" -msgstr "fra" - -msgid "on" -msgstr "" - -msgid "none" -msgstr "ingen" - -msgid "high" -msgstr "" - -msgid "low" -msgstr "" - msgid "*** Invalid Channel ***" msgstr "*** Ugyldig kanal! ***" @@ -234,6 +219,9 @@ msgstr "Free To Air" msgid "encrypted" msgstr "kodet" +msgid "auto" +msgstr "automatisk" + msgid "Edit channel" msgstr "Rediger kanal" @@ -282,18 +270,21 @@ msgstr "Sid" msgid "Polarization" msgstr "Polarisation" -msgid "System" -msgstr "" - msgid "Srate" msgstr "Srate" msgid "Inversion" msgstr "Inversion" +msgid "off" +msgstr "fra" + msgid "CoderateH" msgstr "CoderateH" +msgid "none" +msgstr "ingen" + msgid "CoderateL" msgstr "CoderateL" @@ -312,15 +303,6 @@ msgstr "Guard" msgid "Hierarchy" msgstr "Hierarki" -msgid "Alpha" -msgstr "" - -msgid "Priority" -msgstr "Prioritet" - -msgid "Rolloff" -msgstr "" - msgid "Channel settings are not unique!" msgstr "Kanalindstillinger er ikke entydige!" @@ -366,6 +348,9 @@ msgstr "Stop" msgid "VPS" msgstr "VPS" +msgid "Priority" +msgstr "Prioritet" + msgid "Lifetime" msgstr "Levetid" @@ -906,9 +891,6 @@ msgstr "Overskriv" msgid "Button$Insert" msgstr "Indsæt" -msgid "auto" -msgstr "automatisk" - msgid "Plugin" msgstr "Plugin" diff --git a/po/de_DE.po b/po/de_DE.po index 4ead23bc..05f139e5 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-27 15:00+0100\n" +"POT-Creation-Date: 2007-11-25 14:59+0100\n" "PO-Revision-Date: 2007-11-25 15:19+0200\n" "Last-Translator: Klaus Schmidinger \n" "Language-Team: \n" @@ -15,21 +15,6 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-15\n" "Content-Transfer-Encoding: 8bit\n" -msgid "off" -msgstr "aus" - -msgid "on" -msgstr "ein" - -msgid "none" -msgstr "keine" - -msgid "high" -msgstr "hoch" - -msgid "low" -msgstr "niedrig" - msgid "*** Invalid Channel ***" msgstr "*** Ungültiger Kanal ***" @@ -234,6 +219,9 @@ msgstr "frei empfangbar" msgid "encrypted" msgstr "verschlüsselt" +msgid "auto" +msgstr "auto" + msgid "Edit channel" msgstr "Kanal editieren" @@ -282,18 +270,21 @@ msgstr "Sid" msgid "Polarization" msgstr "Polarisation" -msgid "System" -msgstr "System" - msgid "Srate" msgstr "Srate" msgid "Inversion" msgstr "Inversion" +msgid "off" +msgstr "aus" + msgid "CoderateH" msgstr "CoderateH" +msgid "none" +msgstr "keine" + msgid "CoderateL" msgstr "CoderateL" @@ -312,15 +303,6 @@ msgstr "Guard" msgid "Hierarchy" msgstr "Hierarchie" -msgid "Alpha" -msgstr "Alpha" - -msgid "Priority" -msgstr "Priorität" - -msgid "Rolloff" -msgstr "Rolloff" - msgid "Channel settings are not unique!" msgstr "Kanaleinstellungen sind nicht eindeutig!" @@ -366,6 +348,9 @@ msgstr "Ende" msgid "VPS" msgstr "VPS" +msgid "Priority" +msgstr "Priorität" + msgid "Lifetime" msgstr "Lebensdauer" @@ -906,9 +891,6 @@ msgstr " msgid "Button$Insert" msgstr "Einfügen" -msgid "auto" -msgstr "auto" - msgid "Plugin" msgstr "Plugin" diff --git a/po/el_GR.po b/po/el_GR.po index 3655d6db..4595fb1f 100644 --- a/po/el_GR.po +++ b/po/el_GR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-27 15:00+0100\n" +"POT-Creation-Date: 2007-11-25 14:59+0100\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n" "Last-Translator: Dimitrios Dimitrakos \n" "Language-Team: \n" @@ -15,21 +15,6 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-7\n" "Content-Transfer-Encoding: 8bit\n" -msgid "off" -msgstr "êëåéóôü" - -msgid "on" -msgstr "" - -msgid "none" -msgstr "êáíÝíá" - -msgid "high" -msgstr "" - -msgid "low" -msgstr "" - msgid "*** Invalid Channel ***" msgstr "*** Áêõñï êáíÜëç ***" @@ -234,6 +219,9 @@ msgstr "" msgid "encrypted" msgstr "" +msgid "auto" +msgstr "áõôüìáôï" + msgid "Edit channel" msgstr "Ôñïðïðïßçóç Êáíáëéïý" @@ -282,18 +270,21 @@ msgstr "Sid" msgid "Polarization" msgstr "Ðüëùóç" -msgid "System" -msgstr "" - msgid "Srate" msgstr "Srate" msgid "Inversion" msgstr "ÁíôéóôñïöÞ" +msgid "off" +msgstr "êëåéóôü" + msgid "CoderateH" msgstr "Ñõèìüò Êþäéêá H" +msgid "none" +msgstr "êáíÝíá" + msgid "CoderateL" msgstr "Ñõèìüò Êþäéêá L" @@ -312,15 +303,6 @@ msgstr " msgid "Hierarchy" msgstr "Éåñáñ÷åßá" -msgid "Alpha" -msgstr "" - -msgid "Priority" -msgstr "Ðñïôåñáéüôçôá" - -msgid "Rolloff" -msgstr "" - msgid "Channel settings are not unique!" msgstr "Ïé ñéèìýóåéò ôïí êáíáëéþí áëëõëïóõìðßðôïõí!" @@ -366,6 +348,9 @@ msgstr " msgid "VPS" msgstr "VPS" +msgid "Priority" +msgstr "Ðñïôåñáéüôçôá" + msgid "Lifetime" msgstr "ÄéÝñêåéá ÐáñáìïíÞò" @@ -906,9 +891,6 @@ msgstr " msgid "Button$Insert" msgstr "ÅéóáãùãÞ" -msgid "auto" -msgstr "áõôüìáôï" - msgid "Plugin" msgstr "ÅðÝêôáóç" diff --git a/po/es_ES.po b/po/es_ES.po index ee8a94f4..a90a74e0 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-27 15:00+0100\n" +"POT-Creation-Date: 2007-11-25 14:59+0100\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n" "Last-Translator: Ruben Nunez Francisco \n" "Language-Team: \n" @@ -15,21 +15,6 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-15\n" "Content-Transfer-Encoding: 8bit\n" -msgid "off" -msgstr "off" - -msgid "on" -msgstr "" - -msgid "none" -msgstr "ninguno" - -msgid "high" -msgstr "" - -msgid "low" -msgstr "" - msgid "*** Invalid Channel ***" msgstr "*** Canal no válido ***" @@ -234,6 +219,9 @@ msgstr "en abierto" msgid "encrypted" msgstr "cifrado" +msgid "auto" +msgstr "auto" + msgid "Edit channel" msgstr "Modificar canal" @@ -282,18 +270,21 @@ msgstr "Sid" msgid "Polarization" msgstr "Polarización" -msgid "System" -msgstr "" - msgid "Srate" msgstr "T.símbolos" msgid "Inversion" msgstr "Inversion" +msgid "off" +msgstr "off" + msgid "CoderateH" msgstr "CoderateH" +msgid "none" +msgstr "ninguno" + msgid "CoderateL" msgstr "CoderateL" @@ -312,15 +303,6 @@ msgstr "Int.Guarda" msgid "Hierarchy" msgstr "Jerarquía" -msgid "Alpha" -msgstr "" - -msgid "Priority" -msgstr "Prioridad" - -msgid "Rolloff" -msgstr "" - msgid "Channel settings are not unique!" msgstr "!Propiedades de canal duplicadas!" @@ -366,6 +348,9 @@ msgstr "Fin" msgid "VPS" msgstr "VPS" +msgid "Priority" +msgstr "Prioridad" + msgid "Lifetime" msgstr "Duración" @@ -906,9 +891,6 @@ msgstr "Sobreescribir" msgid "Button$Insert" msgstr "Insertar" -msgid "auto" -msgstr "auto" - msgid "Plugin" msgstr "Plugin" diff --git a/po/et_EE.po b/po/et_EE.po index 878db217..d5c47cd0 100644 --- a/po/et_EE.po +++ b/po/et_EE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-27 15:00+0100\n" +"POT-Creation-Date: 2007-11-25 14:59+0100\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n" "Last-Translator: Arthur Konovalov \n" "Language-Team: \n" @@ -15,21 +15,6 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-13\n" "Content-Transfer-Encoding: 8bit\n" -msgid "off" -msgstr "väljas" - -msgid "on" -msgstr "" - -msgid "none" -msgstr "puudu" - -msgid "high" -msgstr "" - -msgid "low" -msgstr "" - msgid "*** Invalid Channel ***" msgstr "*** Vigane kanal ***" @@ -234,6 +219,9 @@ msgstr "FTA" msgid "encrypted" msgstr "krüptitud" +msgid "auto" +msgstr "automaatne" + msgid "Edit channel" msgstr "Kanali muutmine" @@ -282,18 +270,21 @@ msgstr "Sid" msgid "Polarization" msgstr "Polarisatsioon" -msgid "System" -msgstr "" - msgid "Srate" msgstr "Srate" msgid "Inversion" msgstr "Inversioon" +msgid "off" +msgstr "väljas" + msgid "CoderateH" msgstr "CoderateH" +msgid "none" +msgstr "puudu" + msgid "CoderateL" msgstr "CoderateL" @@ -312,15 +303,6 @@ msgstr "Guard" msgid "Hierarchy" msgstr "Hierarhia" -msgid "Alpha" -msgstr "" - -msgid "Priority" -msgstr "Prioriteet" - -msgid "Rolloff" -msgstr "" - msgid "Channel settings are not unique!" msgstr "Kanaliseaded ei ole unikaalsed!" @@ -366,6 +348,9 @@ msgstr "Stopp" msgid "VPS" msgstr "VPS" +msgid "Priority" +msgstr "Prioriteet" + msgid "Lifetime" msgstr "Eluiga" @@ -906,9 +891,6 @@ msgstr "Asenda (OVR)" msgid "Button$Insert" msgstr "Lisa (INS)" -msgid "auto" -msgstr "automaatne" - msgid "Plugin" msgstr "Laiendusmoodul" diff --git a/po/fi_FI.po b/po/fi_FI.po index 4ac17cff..010c42ad 100644 --- a/po/fi_FI.po +++ b/po/fi_FI.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-27 15:00+0100\n" +"POT-Creation-Date: 2007-11-25 14:59+0100\n" "PO-Revision-Date: 2007-08-15 15:52+0200\n" "Last-Translator: Rolf Ahrenberg \n" "Language-Team: \n" @@ -18,21 +18,6 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-15\n" "Content-Transfer-Encoding: 8bit\n" -msgid "off" -msgstr "pois" - -msgid "on" -msgstr "" - -msgid "none" -msgstr "tyhjä" - -msgid "high" -msgstr "" - -msgid "low" -msgstr "" - msgid "*** Invalid Channel ***" msgstr "*** Virheellinen kanavavalinta ***" @@ -237,6 +222,9 @@ msgstr "vapaa" msgid "encrypted" msgstr "salattu" +msgid "auto" +msgstr "auto" + msgid "Edit channel" msgstr "Muokkaa kanavaa" @@ -285,18 +273,21 @@ msgstr "Palvelu-ID" msgid "Polarization" msgstr "Polarisaatio" -msgid "System" -msgstr "" - msgid "Srate" msgstr "Symbolinopeus" msgid "Inversion" msgstr "Inversio" +msgid "off" +msgstr "pois" + msgid "CoderateH" msgstr "Suojaustaso (HP)" +msgid "none" +msgstr "tyhjä" + msgid "CoderateL" msgstr "Suojaustaso (LP)" @@ -315,15 +306,6 @@ msgstr "Suojav msgid "Hierarchy" msgstr "Hierarkia" -msgid "Alpha" -msgstr "" - -msgid "Priority" -msgstr "Prioriteetti" - -msgid "Rolloff" -msgstr "" - msgid "Channel settings are not unique!" msgstr "Kanava-asetukset eivät ole yksilölliset!" @@ -369,6 +351,9 @@ msgstr "Lopetus" msgid "VPS" msgstr "VPS" +msgid "Priority" +msgstr "Prioriteetti" + msgid "Lifetime" msgstr "Elinikä" @@ -909,9 +894,6 @@ msgstr "Korvaa" msgid "Button$Insert" msgstr "Lisää" -msgid "auto" -msgstr "auto" - msgid "Plugin" msgstr "Laajennos" diff --git a/po/fr_FR.po b/po/fr_FR.po index 84669416..35d35af5 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-27 15:00+0100\n" +"POT-Creation-Date: 2007-11-25 14:59+0100\n" "PO-Revision-Date: 2007-10-18 16:12+0100\n" "Last-Translator: Michael Nival \n" "Language-Team: \n" @@ -21,21 +21,6 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -msgid "off" -msgstr "off" - -msgid "on" -msgstr "" - -msgid "none" -msgstr "aucun" - -msgid "high" -msgstr "" - -msgid "low" -msgstr "" - msgid "*** Invalid Channel ***" msgstr "*** Chaîne invalide ! ***" @@ -240,6 +225,9 @@ msgstr "Aucun cryptage" msgid "encrypted" msgstr "Crypté" +msgid "auto" +msgstr "auto" + msgid "Edit channel" msgstr "Modifier une chaîne" @@ -288,18 +276,21 @@ msgstr "Sid" msgid "Polarization" msgstr "Polarisation" -msgid "System" -msgstr "" - msgid "Srate" msgstr "Fréq. Symbole" msgid "Inversion" msgstr "Inversion" +msgid "off" +msgstr "off" + msgid "CoderateH" msgstr "CoderateH" +msgid "none" +msgstr "aucun" + msgid "CoderateL" msgstr "CoderateL" @@ -318,15 +309,6 @@ msgstr "Guard" msgid "Hierarchy" msgstr "Hiérarchie" -msgid "Alpha" -msgstr "" - -msgid "Priority" -msgstr "Priorité" - -msgid "Rolloff" -msgstr "" - msgid "Channel settings are not unique!" msgstr "Caractéristiques des chaînes non uniques" @@ -372,6 +354,9 @@ msgstr "Fin" msgid "VPS" msgstr "VPS" +msgid "Priority" +msgstr "Priorité" + msgid "Lifetime" msgstr "Durée de vie" @@ -912,9 +897,6 @@ msgstr "Ecraser" msgid "Button$Insert" msgstr "Insérer" -msgid "auto" -msgstr "auto" - msgid "Plugin" msgstr "Plugin" diff --git a/po/hr_HR.po b/po/hr_HR.po index 421d8c3a..a7bf2e17 100644 --- a/po/hr_HR.po +++ b/po/hr_HR.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-27 15:00+0100\n" +"POT-Creation-Date: 2007-11-25 14:59+0100\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n" "Last-Translator: Drazen Dupor \n" "Language-Team: \n" @@ -16,21 +16,6 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8bit\n" -msgid "off" -msgstr "ugasi" - -msgid "on" -msgstr "" - -msgid "none" -msgstr "nijedan" - -msgid "high" -msgstr "" - -msgid "low" -msgstr "" - msgid "*** Invalid Channel ***" msgstr "*** Neispravan program ***" @@ -235,6 +220,9 @@ msgstr "" msgid "encrypted" msgstr "" +msgid "auto" +msgstr "automatski" + msgid "Edit channel" msgstr "Ureðivanje programa" @@ -283,18 +271,21 @@ msgstr "Sid" msgid "Polarization" msgstr "Polarizacija" -msgid "System" -msgstr "" - msgid "Srate" msgstr "Srate" msgid "Inversion" msgstr "Inverzija" +msgid "off" +msgstr "ugasi" + msgid "CoderateH" msgstr "CoderateH" +msgid "none" +msgstr "nijedan" + msgid "CoderateL" msgstr "CoderateL" @@ -313,15 +304,6 @@ msgstr "Za msgid "Hierarchy" msgstr "Hijerarhija" -msgid "Alpha" -msgstr "" - -msgid "Priority" -msgstr "Prioritet" - -msgid "Rolloff" -msgstr "" - msgid "Channel settings are not unique!" msgstr "Parametri programa nisu jednoznaèni!" @@ -367,6 +349,9 @@ msgstr "Kraj" msgid "VPS" msgstr "VPS" +msgid "Priority" +msgstr "Prioritet" + msgid "Lifetime" msgstr "Trajanje" @@ -907,9 +892,6 @@ msgstr "Prepi msgid "Button$Insert" msgstr "Umetni" -msgid "auto" -msgstr "automatski" - msgid "Plugin" msgstr "Plugin" diff --git a/po/hu_HU.po b/po/hu_HU.po index e2f674e9..ebd244fe 100644 --- a/po/hu_HU.po +++ b/po/hu_HU.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-27 15:00+0100\n" +"POT-Creation-Date: 2008-01-13 14:21+0100\n" "PO-Revision-Date: 2007-12-01 21:42+0200\n" "Last-Translator: István Füley \n" "Language-Team: \n" @@ -18,21 +18,6 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8bit\n" -msgid "off" -msgstr "ki" - -msgid "on" -msgstr "" - -msgid "none" -msgstr "semmi" - -msgid "high" -msgstr "" - -msgid "low" -msgstr "" - msgid "*** Invalid Channel ***" msgstr "*** Érvénytelen csatorna ***" @@ -237,6 +222,9 @@ msgstr "K msgid "encrypted" msgstr "Kódolt" +msgid "auto" +msgstr "auto" + msgid "Edit channel" msgstr "Csatornák beállítása" @@ -285,18 +273,21 @@ msgstr "Sid" msgid "Polarization" msgstr "Polarizáció" -msgid "System" -msgstr "" - msgid "Srate" msgstr "Srate" msgid "Inversion" msgstr "Inversion" +msgid "off" +msgstr "ki" + msgid "CoderateH" msgstr "CoderateH" +msgid "none" +msgstr "semmi" + msgid "CoderateL" msgstr "CoderateL" @@ -315,15 +306,6 @@ msgstr "Guard" msgid "Hierarchy" msgstr "Hierarhia" -msgid "Alpha" -msgstr "" - -msgid "Priority" -msgstr "Prioritás" - -msgid "Rolloff" -msgstr "" - msgid "Channel settings are not unique!" msgstr "Az adóbeállítások nem egyértelmûek" @@ -369,6 +351,9 @@ msgstr "V msgid "VPS" msgstr "VPS" +msgid "Priority" +msgstr "Prioritás" + msgid "Lifetime" msgstr "Élettartam" @@ -910,9 +895,6 @@ msgstr " msgid "Button$Insert" msgstr "Beilleszteni" -msgid "auto" -msgstr "auto" - msgid "Plugin" msgstr "Plugin" diff --git a/po/it_IT.po b/po/it_IT.po index 2ec32451..2f88680b 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -10,29 +10,14 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-27 15:00+0100\n" -"PO-Revision-Date: 2008-01-28 00:59+0100\n" +"POT-Creation-Date: 2007-11-25 14:59+0100\n" +"PO-Revision-Date: 2007-10-16 02:15+0100\n" "Last-Translator: Diego Pierotto \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-15\n" "Content-Transfer-Encoding: 8bit\n" -msgid "off" -msgstr "disattivo" - -msgid "on" -msgstr "attivo" - -msgid "none" -msgstr "nessuno" - -msgid "high" -msgstr "alta" - -msgid "low" -msgstr "bassa" - msgid "*** Invalid Channel ***" msgstr "*** Canale NON valido ***" @@ -40,7 +25,7 @@ msgid "Channel not available!" msgstr "Canale non disponibile!" msgid "Can't start Transfer Mode!" -msgstr "Impossibile avviare la modalità di trasferimento!" +msgstr "Impossibile iniziare la modalità di trasferimento!" msgid "Starting EPG scan" msgstr "Inizio scansione EPG" @@ -57,7 +42,7 @@ msgid "LanguageCode$eng" msgstr "ita" msgid "Phase 1: Detecting RC code type" -msgstr "Fase 1: Rilevamento tipo codice RC" +msgstr "Fase 1: tipo ricevitore RC" msgid "Press any key on the RC unit" msgstr "Premi un tasto dell'unità RC" @@ -69,7 +54,7 @@ msgid "Do not press any key..." msgstr "Non premere alcun tasto..." msgid "Phase 2: Learning specific key codes" -msgstr "Fase 2: Apprendimento codici specifici dei tasti" +msgstr "Fase 2: Codici specifici dei tasti" #, c-format msgid "Press key for '%s'" @@ -184,7 +169,7 @@ msgid "Key$Audio" msgstr "Audio" msgid "Key$Subtitles" -msgstr "Sottotitoli" +msgstr "Key$Sottotitoli" msgid "Key$Schedule" msgstr "Programmi" @@ -237,6 +222,9 @@ msgstr "in chiaro" msgid "encrypted" msgstr "criptato" +msgid "auto" +msgstr "automatico" + msgid "Edit channel" msgstr "Modifica canale" @@ -285,44 +273,38 @@ msgstr "Sid" msgid "Polarization" msgstr "Polarizzazione" -msgid "System" -msgstr "Sistema" - msgid "Srate" msgstr "SymbolRate" msgid "Inversion" -msgstr "Inversione" +msgstr "Inversion" + +msgid "off" +msgstr "off" msgid "CoderateH" msgstr "CoderateH" +msgid "none" +msgstr "nessuno" + msgid "CoderateL" msgstr "CoderateL" msgid "Modulation" -msgstr "Modulazione" +msgstr "Modulation" msgid "Bandwidth" msgstr "Banda passante" msgid "Transmission" -msgstr "Trasmissione" +msgstr "Transmission" msgid "Guard" msgstr "Guard" msgid "Hierarchy" -msgstr "Gerarchia" - -msgid "Alpha" -msgstr "Alpha" - -msgid "Priority" -msgstr "Priorità" - -msgid "Rolloff" -msgstr "Rolloff" +msgstr "Hierarchy" msgid "Channel settings are not unique!" msgstr "Parametri canale non univoci!" @@ -369,6 +351,9 @@ msgstr "Fine" msgid "VPS" msgstr "VPS" +msgid "Priority" +msgstr "Priorità" + msgid "Lifetime" msgstr "Durata" @@ -382,7 +367,7 @@ msgid "Timers" msgstr "Timer" msgid "Button$On/Off" -msgstr "Attivo/Disattivo" +msgstr "On/Off" msgid "Button$Info" msgstr "Informazioni" @@ -478,7 +463,7 @@ msgid "never" msgstr "mai" msgid "skin dependent" -msgstr "in base allo stile interfaccia" +msgstr "in base allo stile" msgid "always" msgstr "sempre" @@ -511,7 +496,7 @@ msgid "Setup.OSD$Message time (s)" msgstr "Tempo del messaggio (s)" msgid "Setup.OSD$Use small font" -msgstr "Utilizza caratteri piccoli" +msgstr "Utilizzare caratteri piccoli" msgid "Setup.OSD$Anti-alias" msgstr "Anti-alias" @@ -571,7 +556,7 @@ msgid "Button$Scan" msgstr "Scansione" msgid "Setup.EPG$EPG scan timeout (h)" -msgstr "Scadenza scansione aggiorn. EPG (ore)" +msgstr "Timeout scansione aggiorn. EPG (ore)" msgid "Setup.EPG$EPG bugfix level" msgstr "Livello correzione EPG" @@ -645,22 +630,22 @@ msgid "Setup.DVB$Audio language" msgstr "Lingua per l'audio" msgid "Setup.DVB$Display subtitles" -msgstr "Mostra sottotitoli" +msgstr "Setup.DVB$Mostra sottotitoli" msgid "Setup.DVB$Subtitle languages" -msgstr "Lingue sottotitoli" +msgstr "Setup.DVB$Lingue sottotitoli" msgid "Setup.DVB$Subtitle language" -msgstr "Lingua sottotitoli" +msgstr "Setup.DVB$Lingua sottotitoli" msgid "Setup.DVB$Subtitle offset" -msgstr "Posizione sottotitoli" +msgstr "Setup.DVB$Posizione sottotitolo" msgid "Setup.DVB$Subtitle foreground transparency" -msgstr "Trasparenza primo piano sottotitoli" +msgstr "Setup.DVB$Trasparenza primo piano sottotitoli" msgid "Setup.DVB$Subtitle background transparency" -msgstr "Trasparenza sfondo sottotitoli" +msgstr "Setup.DVB$Trasparenza sfondo sottotitoli" msgid "LNB" msgstr "LNB" @@ -738,7 +723,7 @@ msgid "Setup.Recording$Use VPS" msgstr "Utilizza VPS" msgid "Setup.Recording$VPS margin (s)" -msgstr "Margine VPS (s)" +msgstr "Margine VPS" msgid "Setup.Recording$Mark instant recording" msgstr "Marca registrazione immediata" @@ -765,7 +750,7 @@ msgid "Setup.Replay$Show replay mode" msgstr "Mostra modalità riproduzione" msgid "Setup.Replay$Resume ID" -msgstr "ID di ripristino" +msgstr "ID di rispristino" msgid "Miscellaneous" msgstr "Generici" @@ -795,7 +780,7 @@ msgid "Setup.Miscellaneous$Initial volume" msgstr "Volume iniziale" msgid "Setup.Miscellaneous$Emergency exit" -msgstr "Uscita d'emergenza" +msgstr "" msgid "Plugins" msgstr "Plugins" @@ -861,7 +846,7 @@ msgid "No subtitles" msgstr "Nessun sottotitolo" msgid "Button$Subtitles" -msgstr "Sottotitoli" +msgstr "Button$Sottotitoli" msgid "No subtitles available!" msgstr "Nessun sottotitolo disponibile!" @@ -909,9 +894,6 @@ msgstr "Sovrascrivi" msgid "Button$Insert" msgstr "Inserisci" -msgid "auto" -msgstr "automatico" - msgid "Plugin" msgstr "Plugin" diff --git a/po/nl_NL.po b/po/nl_NL.po index 9fc1177b..e945befa 100644 --- a/po/nl_NL.po +++ b/po/nl_NL.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-27 15:00+0100\n" +"POT-Creation-Date: 2007-11-25 14:59+0100\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n" "Last-Translator: Maarten Wisse \n" "Language-Team: \n" @@ -17,21 +17,6 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-15\n" "Content-Transfer-Encoding: 8bit\n" -msgid "off" -msgstr "uit" - -msgid "on" -msgstr "" - -msgid "none" -msgstr "geen" - -msgid "high" -msgstr "" - -msgid "low" -msgstr "" - msgid "*** Invalid Channel ***" msgstr "*** Ongeldig kanaal ***" @@ -236,6 +221,9 @@ msgstr "" msgid "encrypted" msgstr "" +msgid "auto" +msgstr "auto" + msgid "Edit channel" msgstr "Kanaal aanpassen" @@ -284,18 +272,21 @@ msgstr "Sid" msgid "Polarization" msgstr "Polarisatie" -msgid "System" -msgstr "" - msgid "Srate" msgstr "Srate" msgid "Inversion" msgstr "Inversion" +msgid "off" +msgstr "uit" + msgid "CoderateH" msgstr "CoderateH" +msgid "none" +msgstr "geen" + msgid "CoderateL" msgstr "CoderateL" @@ -314,15 +305,6 @@ msgstr "Guard" msgid "Hierarchy" msgstr "Hierarchy" -msgid "Alpha" -msgstr "" - -msgid "Priority" -msgstr "Prioriteit" - -msgid "Rolloff" -msgstr "" - msgid "Channel settings are not unique!" msgstr "Kanaalinstellingen zijn niet uniek!" @@ -368,6 +350,9 @@ msgstr "Einde" msgid "VPS" msgstr "VPS" +msgid "Priority" +msgstr "Prioriteit" + msgid "Lifetime" msgstr "Bewaarduur" @@ -908,9 +893,6 @@ msgstr "Overschrijven" msgid "Button$Insert" msgstr "Invoegen" -msgid "auto" -msgstr "auto" - msgid "Plugin" msgstr "Plugin" diff --git a/po/nn_NO.po b/po/nn_NO.po index 4c4c2671..bd2238e3 100644 --- a/po/nn_NO.po +++ b/po/nn_NO.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-27 15:00+0100\n" +"POT-Creation-Date: 2007-11-25 14:59+0100\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n" "Last-Translator: Truls Slevigen \n" "Language-Team: \n" @@ -16,21 +16,6 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -msgid "off" -msgstr "" - -msgid "on" -msgstr "" - -msgid "none" -msgstr "" - -msgid "high" -msgstr "" - -msgid "low" -msgstr "" - msgid "*** Invalid Channel ***" msgstr "*** Ugyldig Kanal! ***" @@ -235,6 +220,9 @@ msgstr "" msgid "encrypted" msgstr "" +msgid "auto" +msgstr "" + msgid "Edit channel" msgstr "Editer kanal" @@ -283,18 +271,21 @@ msgstr "Sid" msgid "Polarization" msgstr "Polarisasjon" -msgid "System" -msgstr "" - msgid "Srate" msgstr "Srate" msgid "Inversion" msgstr "Inversion" +msgid "off" +msgstr "" + msgid "CoderateH" msgstr "CoderateH" +msgid "none" +msgstr "" + msgid "CoderateL" msgstr "CoderateL" @@ -313,15 +304,6 @@ msgstr "Guard" msgid "Hierarchy" msgstr "Hierarchy" -msgid "Alpha" -msgstr "" - -msgid "Priority" -msgstr "Prioritet" - -msgid "Rolloff" -msgstr "" - msgid "Channel settings are not unique!" msgstr "" @@ -367,6 +349,9 @@ msgstr "Slutt" msgid "VPS" msgstr "" +msgid "Priority" +msgstr "Prioritet" + msgid "Lifetime" msgstr "Levetid" @@ -907,9 +892,6 @@ msgstr "" msgid "Button$Insert" msgstr "" -msgid "auto" -msgstr "" - msgid "Plugin" msgstr "Plugin" diff --git a/po/pl_PL.po b/po/pl_PL.po index 3ffef6a1..d8be8772 100644 --- a/po/pl_PL.po +++ b/po/pl_PL.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-27 15:00+0100\n" +"POT-Creation-Date: 2007-11-25 14:59+0100\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n" "Last-Translator: Michael Rakowski \n" "Language-Team: \n" @@ -15,21 +15,6 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8bit\n" -msgid "off" -msgstr "wy³±cz" - -msgid "on" -msgstr "" - -msgid "none" -msgstr "brak" - -msgid "high" -msgstr "" - -msgid "low" -msgstr "" - msgid "*** Invalid Channel ***" msgstr "*** Niepoprawny kana³ ***" @@ -234,6 +219,9 @@ msgstr "nieszyfrowany" msgid "encrypted" msgstr "szyfrowany" +msgid "auto" +msgstr "auto" + msgid "Edit channel" msgstr "Edycja kana³u" @@ -282,18 +270,21 @@ msgstr "Sid" msgid "Polarization" msgstr "Polaryzacja" -msgid "System" -msgstr "" - msgid "Srate" msgstr "Srate" msgid "Inversion" msgstr "Inwersja" +msgid "off" +msgstr "wy³±cz" + msgid "CoderateH" msgstr "CoderateH" +msgid "none" +msgstr "brak" + msgid "CoderateL" msgstr "CoderateL" @@ -312,15 +303,6 @@ msgstr "Guard" msgid "Hierarchy" msgstr "Hierarchia" -msgid "Alpha" -msgstr "" - -msgid "Priority" -msgstr "Priorytet" - -msgid "Rolloff" -msgstr "" - msgid "Channel settings are not unique!" msgstr "Ustawienia kana³u nie s± unikalne!" @@ -366,6 +348,9 @@ msgstr "Koniec" msgid "VPS" msgstr "VPS" +msgid "Priority" +msgstr "Priorytet" + msgid "Lifetime" msgstr "Czas ¿ycia" @@ -906,9 +891,6 @@ msgstr "Nadpisz" msgid "Button$Insert" msgstr "Wstaw" -msgid "auto" -msgstr "auto" - msgid "Plugin" msgstr "Wtyczka" diff --git a/po/pt_PT.po b/po/pt_PT.po index 1d78201c..1786077d 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-27 15:00+0100\n" +"POT-Creation-Date: 2007-11-25 14:59+0100\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n" "Last-Translator: Paulo Lopes \n" "Language-Team: \n" @@ -15,21 +15,6 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -msgid "off" -msgstr "off" - -msgid "on" -msgstr "" - -msgid "none" -msgstr "" - -msgid "high" -msgstr "" - -msgid "low" -msgstr "" - msgid "*** Invalid Channel ***" msgstr "*** Canal Inválido! ***" @@ -234,6 +219,9 @@ msgstr "" msgid "encrypted" msgstr "" +msgid "auto" +msgstr "" + msgid "Edit channel" msgstr "Modificar canal" @@ -282,18 +270,21 @@ msgstr "Sid" msgid "Polarization" msgstr "Polarização" -msgid "System" -msgstr "" - msgid "Srate" msgstr "Srate" msgid "Inversion" msgstr "Inversion" +msgid "off" +msgstr "off" + msgid "CoderateH" msgstr "CoderateH" +msgid "none" +msgstr "" + msgid "CoderateL" msgstr "CoderateL" @@ -312,15 +303,6 @@ msgstr "Guard" msgid "Hierarchy" msgstr "Hierarchy" -msgid "Alpha" -msgstr "" - -msgid "Priority" -msgstr "Prioridade" - -msgid "Rolloff" -msgstr "" - msgid "Channel settings are not unique!" msgstr "" @@ -366,6 +348,9 @@ msgstr "Fim" msgid "VPS" msgstr "" +msgid "Priority" +msgstr "Prioridade" + msgid "Lifetime" msgstr "Duração" @@ -906,9 +891,6 @@ msgstr "" msgid "Button$Insert" msgstr "" -msgid "auto" -msgstr "" - msgid "Plugin" msgstr "Plugin" diff --git a/po/ro_RO.po b/po/ro_RO.po index 21bc1b86..72fc8b9b 100644 --- a/po/ro_RO.po +++ b/po/ro_RO.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-27 15:00+0100\n" +"POT-Creation-Date: 2007-11-25 14:59+0100\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n" "Last-Translator: Lucian Muresan \n" "Language-Team: \n" @@ -16,21 +16,6 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8bit\n" -msgid "off" -msgstr "inactiv" - -msgid "on" -msgstr "" - -msgid "none" -msgstr "niciuna(ul)" - -msgid "high" -msgstr "" - -msgid "low" -msgstr "" - msgid "*** Invalid Channel ***" msgstr "*** Canal invalid ***" @@ -235,6 +220,9 @@ msgstr "FTA (necriptat)" msgid "encrypted" msgstr "criptat" +msgid "auto" +msgstr "automat" + msgid "Edit channel" msgstr "Modificare canal" @@ -283,18 +271,21 @@ msgstr "Sid" msgid "Polarization" msgstr "Polarizare" -msgid "System" -msgstr "" - msgid "Srate" msgstr "Ratã simboluri" msgid "Inversion" msgstr "Inversiune" +msgid "off" +msgstr "inactiv" + msgid "CoderateH" msgstr "CoderateH" +msgid "none" +msgstr "niciuna(ul)" + msgid "CoderateL" msgstr "CoderateL" @@ -313,15 +304,6 @@ msgstr "Guard" msgid "Hierarchy" msgstr "Ierarhie" -msgid "Alpha" -msgstr "" - -msgid "Priority" -msgstr "Prioritate" - -msgid "Rolloff" -msgstr "" - msgid "Channel settings are not unique!" msgstr "Parametrii canalului nu sunt univoci!" @@ -367,6 +349,9 @@ msgstr "Sf msgid "VPS" msgstr "VPS" +msgid "Priority" +msgstr "Prioritate" + msgid "Lifetime" msgstr "Timp de pãstrare" @@ -907,9 +892,6 @@ msgstr "Suprascrie" msgid "Button$Insert" msgstr "Insereazã" -msgid "auto" -msgstr "automat" - msgid "Plugin" msgstr "Plugin (modul adiþional)" diff --git a/po/ru_RU.po b/po/ru_RU.po index 2fe55adb..6f6038ed 100644 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-27 15:00+0100\n" +"POT-Creation-Date: 2007-11-25 14:59+0100\n" "PO-Revision-Date: 2007-11-05 14:24+0100\n" "Last-Translator: Oleg Roitburd \n" "Language-Team: \n" @@ -16,21 +16,6 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-5\n" "Content-Transfer-Encoding: 8bit\n" -msgid "off" -msgstr "ÒëÚÛ" - -msgid "on" -msgstr "" - -msgid "none" -msgstr "ÝØçÕÓÞ" - -msgid "high" -msgstr "" - -msgid "low" -msgstr "" - msgid "*** Invalid Channel ***" msgstr "*** ½ÕßàÐÒØÛìÝëÙ ÚÐÝÐÛ ***" @@ -235,6 +220,9 @@ msgstr "FTA ( msgid "encrypted" msgstr "×ÐÚÞÔØàÞÒÐÝÞ" +msgid "auto" +msgstr "ÐÒâÞ" + msgid "Edit channel" msgstr "ÀÕÔÐÚâØàÞÒÐÝØÕ ÚÐÝÐÛÐ" @@ -283,18 +271,21 @@ msgstr "Sid" msgid "Polarization" msgstr "¿ÞÛïàØ×ÐæØï" -msgid "System" -msgstr "" - msgid "Srate" msgstr "ÁØÜÒ. áÚÞàÞáâì" msgid "Inversion" msgstr "¸ÝÒÕàáØï" +msgid "off" +msgstr "ÒëÚÛ" + msgid "CoderateH" msgstr "CoderateH" +msgid "none" +msgstr "ÝØçÕÓÞ" + msgid "CoderateL" msgstr "CoderateL" @@ -313,15 +304,6 @@ msgstr " msgid "Hierarchy" msgstr "¸ÕàÐàåØï" -msgid "Alpha" -msgstr "" - -msgid "Priority" -msgstr "¿àØÞàØâÕâ" - -msgid "Rolloff" -msgstr "" - msgid "Channel settings are not unique!" msgstr "½ÐáâàÞÙÚØ ÚÐÝÐÛÐ ÝÕ ãÝØÚÐÛìÝë!" @@ -367,6 +349,9 @@ msgstr " msgid "VPS" msgstr "VPS ßÞßàÐÒÚÐ" +msgid "Priority" +msgstr "¿àØÞàØâÕâ" + msgid "Lifetime" msgstr "ÁàÞÚ åàÐÝÕÝØï" @@ -907,9 +892,6 @@ msgstr " msgid "Button$Insert" msgstr "²áâÐÒÚÐ" -msgid "auto" -msgstr "ÐÒâÞ" - msgid "Plugin" msgstr "¼ÞÔãÛì" diff --git a/po/sl_SI.po b/po/sl_SI.po index 584838b1..002b82cd 100644 --- a/po/sl_SI.po +++ b/po/sl_SI.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-27 15:00+0100\n" +"POT-Creation-Date: 2007-11-25 14:59+0100\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n" "Last-Translator: Matjaz Thaler \n" "Language-Team: \n" @@ -16,21 +16,6 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8bit\n" -msgid "off" -msgstr "izklop" - -msgid "on" -msgstr "" - -msgid "none" -msgstr "nobeden" - -msgid "high" -msgstr "" - -msgid "low" -msgstr "" - msgid "*** Invalid Channel ***" msgstr "*** Neznan kanal ***" @@ -235,6 +220,9 @@ msgstr "nekodiran" msgid "encrypted" msgstr "kodiran" +msgid "auto" +msgstr "avtomatsko" + msgid "Edit channel" msgstr "Uredi kanal" @@ -283,18 +271,21 @@ msgstr "Sid" msgid "Polarization" msgstr "Polarizacija" -msgid "System" -msgstr "" - msgid "Srate" msgstr "Srate" msgid "Inversion" msgstr "Inverzija" +msgid "off" +msgstr "izklop" + msgid "CoderateH" msgstr "CoderateH" +msgid "none" +msgstr "nobeden" + msgid "CoderateL" msgstr "CoderateL" @@ -313,15 +304,6 @@ msgstr "Za msgid "Hierarchy" msgstr "Hierarhija" -msgid "Alpha" -msgstr "" - -msgid "Priority" -msgstr "Prioriteta" - -msgid "Rolloff" -msgstr "" - msgid "Channel settings are not unique!" msgstr "Nastavitve kanala niso edinstvene!" @@ -367,6 +349,9 @@ msgstr "Konec" msgid "VPS" msgstr "VPS" +msgid "Priority" +msgstr "Prioriteta" + msgid "Lifetime" msgstr "Veljavnost" @@ -907,9 +892,6 @@ msgstr "Prepi msgid "Button$Insert" msgstr "Vstavi" -msgid "auto" -msgstr "avtomatsko" - msgid "Plugin" msgstr "Vstavek" diff --git a/po/sv_SE.po b/po/sv_SE.po index 68920f2a..40d3c252 100644 --- a/po/sv_SE.po +++ b/po/sv_SE.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-27 15:00+0100\n" +"POT-Creation-Date: 2007-11-25 14:59+0100\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n" "Last-Translator: Tomas Prybil \n" "Language-Team: \n" @@ -16,21 +16,6 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -msgid "off" -msgstr "av" - -msgid "on" -msgstr "" - -msgid "none" -msgstr "ingen" - -msgid "high" -msgstr "" - -msgid "low" -msgstr "" - msgid "*** Invalid Channel ***" msgstr "*** Felaktig kanal ***" @@ -235,6 +220,9 @@ msgstr "Okodad" msgid "encrypted" msgstr "krypterad" +msgid "auto" +msgstr "automatisk" + msgid "Edit channel" msgstr "Ändra kanal" @@ -283,18 +271,21 @@ msgstr "Sid" msgid "Polarization" msgstr "Polarisation" -msgid "System" -msgstr "" - msgid "Srate" msgstr "Srate" msgid "Inversion" msgstr "Inversion" +msgid "off" +msgstr "av" + msgid "CoderateH" msgstr "CoderateH" +msgid "none" +msgstr "ingen" + msgid "CoderateL" msgstr "CoderateL" @@ -313,15 +304,6 @@ msgstr "Guard" msgid "Hierarchy" msgstr "Hierarchy" -msgid "Alpha" -msgstr "" - -msgid "Priority" -msgstr "Prioritet" - -msgid "Rolloff" -msgstr "" - msgid "Channel settings are not unique!" msgstr "Kanalinställningarna är ej unika!" @@ -367,6 +349,9 @@ msgstr "Slutar" msgid "VPS" msgstr "VPS" +msgid "Priority" +msgstr "Prioritet" + msgid "Lifetime" msgstr "Livstid" @@ -907,9 +892,6 @@ msgstr "Skriv msgid "Button$Insert" msgstr "Infoga" -msgid "auto" -msgstr "automatisk" - msgid "Plugin" msgstr "Modul" diff --git a/po/tr_TR.po b/po/tr_TR.po index 0b25c72f..57a73090 100644 --- a/po/tr_TR.po +++ b/po/tr_TR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-27 15:00+0100\n" +"POT-Creation-Date: 2007-11-25 14:59+0100\n" "PO-Revision-Date: 2007-08-24 14:37+0200\n" "Last-Translator: Oktay Yolgeçen \n" "Language-Team: \n" @@ -15,21 +15,6 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-9\n" "Content-Transfer-Encoding: 8bit\n" -msgid "off" -msgstr "kapalý" - -msgid "on" -msgstr "" - -msgid "none" -msgstr "hiç" - -msgid "high" -msgstr "" - -msgid "low" -msgstr "" - msgid "*** Invalid Channel ***" msgstr "*** Geçersiz kanal ***" @@ -234,6 +219,9 @@ msgstr " msgid "encrypted" msgstr "Þifreli" +msgid "auto" +msgstr "otomatik" + msgid "Edit channel" msgstr "Kanal ayarlarýný deðiþtir" @@ -282,18 +270,21 @@ msgstr "Sid" msgid "Polarization" msgstr "Kutuplaþma" -msgid "System" -msgstr "" - msgid "Srate" msgstr "Srate" msgid "Inversion" msgstr "Ýnversiyon" +msgid "off" +msgstr "kapalý" + msgid "CoderateH" msgstr "CoderateH" +msgid "none" +msgstr "hiç" + msgid "CoderateL" msgstr "CoderateL" @@ -312,15 +303,6 @@ msgstr "Koruma" msgid "Hierarchy" msgstr "Hiyerarþi" -msgid "Alpha" -msgstr "" - -msgid "Priority" -msgstr "Öncelik" - -msgid "Rolloff" -msgstr "" - msgid "Channel settings are not unique!" msgstr "Kanal ayarlarý belli deðýl!" @@ -366,6 +348,9 @@ msgstr "Biti msgid "VPS" msgstr "VPS" +msgid "Priority" +msgstr "Öncelik" + msgid "Lifetime" msgstr "Ömrü" @@ -906,9 +891,6 @@ msgstr " msgid "Button$Insert" msgstr "Ekle" -msgid "auto" -msgstr "otomatik" - msgid "Plugin" msgstr "Eklenti" diff --git a/po/uk_UA.po b/po/uk_UA.po index 62ec8cfb..70afcaf8 100644 --- a/po/uk_UA.po +++ b/po/uk_UA.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.10\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-27 15:00+0100\n" +"POT-Creation-Date: 2007-11-25 14:59+0100\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n" "Last-Translator: Yarema Aka Knedlyk \n" "Language-Team: \n" @@ -15,21 +15,6 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-5\n" "Content-Transfer-Encoding: 8bit\n" -msgid "off" -msgstr "ÒØÚÛ" - -msgid "on" -msgstr "" - -msgid "none" -msgstr "ÝöçÞÓÞ" - -msgid "high" -msgstr "" - -msgid "low" -msgstr "" - msgid "*** Invalid Channel ***" msgstr "*** ½ÕßàÐÒØÛìÝØÙ ÚÐÝÐÛ ***" @@ -234,6 +219,9 @@ msgstr "FTA ( msgid "encrypted" msgstr "×ÐÚÞÔÞÒÐÝÞ" +msgid "auto" +msgstr "ÐÒâÞ" + msgid "Edit channel" msgstr "ÀÕÔÐÚâãÒÐÝÝï ÚÐÝÐÛã" @@ -282,18 +270,21 @@ msgstr "Sid" msgid "Polarization" msgstr "¿ÞÛïàØ×Ðæöï" -msgid "System" -msgstr "" - msgid "Srate" msgstr "ÁØÜÒ. èÒØÔÚöáâì" msgid "Inversion" msgstr "¦ÝÒÕàáöï" +msgid "off" +msgstr "ÒØÚÛ" + msgid "CoderateH" msgstr "CoderateH" +msgid "none" +msgstr "ÝöçÞÓÞ" + msgid "CoderateL" msgstr "CoderateL" @@ -312,15 +303,6 @@ msgstr " msgid "Hierarchy" msgstr "¦ôàÐàåöï" -msgid "Alpha" -msgstr "" - -msgid "Priority" -msgstr "¿àöÞàØâÕâ" - -msgid "Rolloff" -msgstr "" - msgid "Channel settings are not unique!" msgstr "½ÐáâàÞÙÚØ ÚÐÝÐÛã ÝÕ ôÔØÝö!" @@ -366,6 +348,9 @@ msgstr " msgid "VPS" msgstr "VPS ßÞßàÐÒÚÐ" +msgid "Priority" +msgstr "¿àöÞàØâÕâ" + msgid "Lifetime" msgstr "ÁâàÞÚ ×ÑÕàöÓÐÝÝï" @@ -908,9 +893,6 @@ msgstr " msgid "Button$Insert" msgstr "²áâÐÒÚÐ" -msgid "auto" -msgstr "ÐÒâÞ" - msgid "Plugin" msgstr "¼ÞÔãÛì" diff --git a/sdt.c b/sdt.c index 2ddd7e31..1a360e23 100644 --- a/sdt.c +++ b/sdt.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: sdt.c 1.18 2008/01/27 13:24:25 kls Exp $ + * $Id: sdt.c 1.19 2008/02/08 13:48:31 kls Exp $ */ #include "sdt.h" @@ -55,7 +55,6 @@ void cSdtFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length case 0x02: // digital radio sound service case 0x04: // NVOD reference service case 0x05: // NVOD time-shifted service - case 0x19: // digital HD television service { char NameBuf[Utf8BufSize(1024)]; char ShortNameBuf[Utf8BufSize(1024)]; diff --git a/vdr.5 b/vdr.5 index 3c836104..c4b59c6f 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 1.65 2008/01/26 14:16:51 kls Exp $ +.\" $Id: vdr.5 1.66 2008/02/08 13:48:31 kls Exp $ .\" .TH vdr 5 "07 Jan 2007" "1.4.5" "Video Disk Recorder Files" .SH NAME @@ -83,23 +83,19 @@ meaning (and allowed values) are .TS tab (@); l l. -\fBA\fR@Alpha (0, 1, 2, 4) -\fBB\fR@Bandwidth (5, 6, 7, 8) -\fBC\fR@Code rate high priority (0, 12, 13, 14, 23, 25, 34, 35, 45, 56, 67, 78, 89, 910) -\fBD\fR@coDe rate low priority (0, 12, 13, 14, 23, 25, 34, 35, 45, 56, 67, 78, 89, 910) +\fBB\fR@Bandwidth (6, 7, 8) +\fBC\fR@Code rate high priority (0, 12, 23, 34, 45, 56, 67, 78, 89) +\fBD\fR@Code rate low priority (0, 12, 23, 34, 45, 56, 67, 78, 89) \fBG\fR@Guard interval (4, 8, 16, 32) \fBH\fR@Horizontal polarization \fBI\fR@Inversion (0, 1) \fBL\fR@Left circular polarization -\fBM\fR@Modulation (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 16, 32, 64, 128, 256, 512, 998, 1024) -\fBO\fR@rollOff (0, 20, 25, 35) -\fBP\fR@Priority (0, 1) +\fBM\fR@Modulation (0, 16, 32, 64, 128, 256) \fBR\fR@Right circular polarization -\fBT\fR@Transmission mode (2, 4, 8) +\fBT\fR@Transmission mode (2, 8) \fBV\fR@Vertical polarization -\fBY\fR@hierarchY (0, 1) +\fBY\fR@Hierarchy (0, 1, 2, 4) .TE - The polarization parameters have no integer numbers following them. This is for compatibility with files from older versions and also to keep the DVB-S entries as simple as possible.