diff options
| -rw-r--r-- | HISTORY | 10 | ||||
| -rw-r--r-- | MANUAL | 9 | ||||
| -rw-r--r-- | config.c | 5 | ||||
| -rw-r--r-- | config.h | 3 | ||||
| -rw-r--r-- | device.c | 13 | ||||
| -rw-r--r-- | device.h | 14 | ||||
| -rw-r--r-- | dvbdevice.c | 8 | ||||
| -rw-r--r-- | menu.c | 7 | ||||
| -rw-r--r-- | po/ar.po | 62 | ||||
| -rw-r--r-- | po/ca_ES.po | 5 | ||||
| -rw-r--r-- | po/cs_CZ.po | 5 | ||||
| -rw-r--r-- | po/da_DK.po | 5 | ||||
| -rw-r--r-- | po/de_DE.po | 5 | ||||
| -rw-r--r-- | po/el_GR.po | 5 | ||||
| -rw-r--r-- | po/es_ES.po | 5 | ||||
| -rw-r--r-- | po/et_EE.po | 5 | ||||
| -rw-r--r-- | po/fi_FI.po | 5 | ||||
| -rw-r--r-- | po/fr_FR.po | 5 | ||||
| -rw-r--r-- | po/hr_HR.po | 5 | ||||
| -rw-r--r-- | po/hu_HU.po | 5 | ||||
| -rw-r--r-- | po/it_IT.po | 5 | ||||
| -rw-r--r-- | po/lt_LT.po | 5 | ||||
| -rw-r--r-- | po/mk_MK.po | 5 | ||||
| -rw-r--r-- | po/nl_NL.po | 5 | ||||
| -rw-r--r-- | po/nn_NO.po | 5 | ||||
| -rw-r--r-- | po/pl_PL.po | 5 | ||||
| -rw-r--r-- | po/pt_PT.po | 5 | ||||
| -rw-r--r-- | po/ro_RO.po | 5 | ||||
| -rw-r--r-- | po/ru_RU.po | 5 | ||||
| -rw-r--r-- | po/sk_SK.po | 5 | ||||
| -rw-r--r-- | po/sl_SI.po | 5 | ||||
| -rw-r--r-- | po/sr_SR.po | 5 | ||||
| -rw-r--r-- | po/sv_SE.po | 5 | ||||
| -rw-r--r-- | po/tr_TR.po | 5 | ||||
| -rw-r--r-- | po/uk_UA.po | 5 | ||||
| -rw-r--r-- | po/zh_CN.po | 5 | ||||
| -rw-r--r-- | receiver.h | 4 |
37 files changed, 59 insertions, 211 deletions
@@ -6889,7 +6889,7 @@ Video Disk Recorder Revision History - Fixed switching into time shift mode when pausing live video (thanks to Reinhard Nissl for helping to debug this one). -2012-02-24: Version 1.7.25 +2012-02-25: Version 1.7.25 - The fps value for channels where it differs from the default is now set correctly when pausing live video. @@ -6909,3 +6909,11 @@ Video Disk Recorder Revision History - Fixed upscaling cBitmaps with anti-aliasing (thanks to Rolf Ahrenberg for reporting a problem with color palettes in subtitles). - Fixed getting the video aspect ratio for scaling subtitles. +- Removed the "PrimaryLimit". Old "full featured" DVB cards can be run with the + --outputonly option to avoid problems with recording high bandwidth channels. + Besides, with HDTV becoming ever more popular those cards are pretty much obsolete + by now (the TT S2-6400 has no problems recording and replaying high bandwidth + channels simultaneously). And, last but not least, people using software players + won't notice this change, anyway. +- Since cReceivers can have priorities between -99 and 99, the priority + for an unused device has been changed from -1 to -100. @@ -763,15 +763,6 @@ Version 1.6 These margins are added automatically to timers that are created from the EPG data. - Primary limit = 0 The minimum priority a timer must have to be allowed to - use the primary DVB interface, or to force another timer - with higher priority to use the primary DVB interface. - This is mainly useful for recordings that should take - place only when there is nothing else to do, but should - never keep the user from viewing stuff on the primary - interface. On systems with only one DVB card, timers - with a priority below PrimaryLimit will never execute. - Default priority = 50 The default Priority and Lifetime values used when Default lifetime = 99 creating a new timer event. A Lifetime value of 99 means that this recording will never be deleted @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: config.c 2.18 2012/01/14 13:04:59 kls Exp $ + * $Id: config.c 2.19 2012/02/25 13:31:46 kls Exp $ */ #include "config.h" @@ -406,7 +406,6 @@ cSetup::cSetup(void) SVDRPTimeout = 300; ZapTimeout = 3; ChannelEntryTimeout = 1000; - PrimaryLimit = 0; DefaultPriority = 50; DefaultLifetime = 99; PauseKeyHandling = 2; @@ -601,7 +600,6 @@ bool cSetup::Parse(const char *Name, const char *Value) else if (!strcasecmp(Name, "SVDRPTimeout")) SVDRPTimeout = atoi(Value); else if (!strcasecmp(Name, "ZapTimeout")) ZapTimeout = atoi(Value); else if (!strcasecmp(Name, "ChannelEntryTimeout")) ChannelEntryTimeout= atoi(Value); - else if (!strcasecmp(Name, "PrimaryLimit")) PrimaryLimit = atoi(Value); else if (!strcasecmp(Name, "DefaultPriority")) DefaultPriority = atoi(Value); else if (!strcasecmp(Name, "DefaultLifetime")) DefaultLifetime = atoi(Value); else if (!strcasecmp(Name, "PauseKeyHandling")) PauseKeyHandling = atoi(Value); @@ -699,7 +697,6 @@ bool cSetup::Save(void) Store("SVDRPTimeout", SVDRPTimeout); Store("ZapTimeout", ZapTimeout); Store("ChannelEntryTimeout",ChannelEntryTimeout); - Store("PrimaryLimit", PrimaryLimit); Store("DefaultPriority", DefaultPriority); Store("DefaultLifetime", DefaultLifetime); Store("PauseKeyHandling", PauseKeyHandling); @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: config.h 2.41 2012/02/19 14:33:23 kls Exp $ + * $Id: config.h 2.42 2012/02/25 13:31:34 kls Exp $ */ #ifndef __CONFIG_H @@ -264,7 +264,6 @@ public: int SVDRPTimeout; int ZapTimeout; int ChannelEntryTimeout; - int PrimaryLimit; int DefaultPriority, DefaultLifetime; int PausePriority, PauseLifetime; int PauseKeyHandling; @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: device.c 2.49 2012/02/15 13:15:19 kls Exp $ + * $Id: device.c 2.50 2012/02/25 12:45:53 kls Exp $ */ #include "device.h" @@ -59,9 +59,6 @@ bool cDeviceHook::DeviceProvidesTransponder(const cDevice *Device, const cChanne // --- cDevice --------------------------------------------------------------- -// The default priority for non-primary devices: -#define DEFAULTPRIORITY -1 - // The minimum number of unknown PS1 packets to consider this a "pre 1.3.19 private stream": #define MIN_PRE_1_3_19_PRIVATESTREAM 10 @@ -269,7 +266,7 @@ cDevice *cDevice::GetDevice(const cChannel *Channel, int Priority, bool LiveView if (NumUsableSlots && !CamSlots.Get(j)->Assign(device[i], true)) continue; // CAM slot can't be used with this device bool ndr; - if (device[i]->ProvidesChannel(Channel, (LiveView && device[i]->IsPrimaryDevice()) ? Setup.PrimaryLimit : Priority, &ndr)) { // this device is basicly able to do the job + if (device[i]->ProvidesChannel(Channel, Priority, &ndr)) { // this device is basicly able to do the job if (NumUsableSlots && device[i]->CamSlot() && device[i]->CamSlot() != CamSlots.Get(j)) ndr = true; // using a different CAM slot requires detaching receivers // Put together an integer number that reflects the "impact" using @@ -690,7 +687,7 @@ bool cDevice::SwitchChannel(int Direction) cChannel *channel; while ((channel = Channels.GetByNumber(n, Direction)) != NULL) { // try only channels which are currently available - if (GetDevice(channel, 0, true)) + if (GetDevice(channel, LIVEPRIORITY, true)) break; n = channel->Number() + Direction; } @@ -717,7 +714,7 @@ eSetChannelResult cDevice::SetChannel(const cChannel *Channel, bool LiveView) DELETENULL(dvbSubtitleConverter); } - cDevice *Device = (LiveView && IsPrimaryDevice()) ? GetDevice(Channel, 0, LiveView) : this; + cDevice *Device = (LiveView && IsPrimaryDevice()) ? GetDevice(Channel, LIVEPRIORITY, true) : this; bool NeedsTransferMode = Device != this; @@ -1495,7 +1492,7 @@ int cDevice::PlayTs(const uchar *Data, int Length, bool VideoOnly) int cDevice::Priority(void) const { - int priority = IsPrimaryDevice() ? Setup.PrimaryLimit - 1 : DEFAULTPRIORITY; + int priority = IDLEPRIORITY; cMutexLock MutexLock(&mutexReceiver); for (int i = 0; i < MAXRECEIVERS; i++) { if (receiver[i]) @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: device.h 2.33 2012/02/14 14:42:42 kls Exp $ + * $Id: device.h 2.34 2012/02/25 12:54:39 kls Exp $ */ #ifndef __DEVICE_H @@ -31,6 +31,8 @@ #define MAXVOLUME 255 #define VOLUMEDELTA 5 // used to increase/decrease the volume #define MAXOCCUPIEDTIMEOUT 99 // max. time (in seconds) a device may be occupied +#define LIVEPRIORITY 0 // priority used when selecting a device for live viewing +#define IDLEPRIORITY (-MAXPRIORITY - 1) enum eSetChannelResult { scrOk, scrNotAvailable, scrNoTransfer, scrFailed }; @@ -237,9 +239,8 @@ public: ///< the given channel's transponder. virtual bool ProvidesChannel(const cChannel *Channel, int Priority = -1, bool *NeedsDetachReceivers = NULL) const; ///< Returns true if this device can provide the given channel. - ///< In case the device has cReceivers attached to it or it is the primary - ///< device, Priority is used to decide whether the caller's request can - ///< be honored. + ///< In case the device has cReceivers attached to it, Priority is used to + ///< decide whether the caller's request can be honored. ///< The special Priority value -1 will tell the caller whether this device ///< is principally able to provide the given Channel, regardless of any ///< attached cReceivers. @@ -719,9 +720,8 @@ private: cReceiver *receiver[MAXRECEIVERS]; public: int Priority(void) const; - ///< Returns the priority of the current receiving session (0..MAXPRIORITY), - ///< or -1 if no receiver is currently active. The primary device will - ///< always return at least Setup.PrimaryLimit-1. + ///< Returns the priority of the current receiving session (-MAXPRIORITY..MAXPRIORITY), + ///< or IDLEPRIORITY if no receiver is currently active. protected: virtual bool OpenDvr(void); ///< Opens the DVR of this device and prepares it to deliver a Transport diff --git a/dvbdevice.c b/dvbdevice.c index 34a4f503..ac505f00 100644 --- a/dvbdevice.c +++ b/dvbdevice.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: dvbdevice.c 2.63 2012/02/20 12:45:49 kls Exp $ + * $Id: dvbdevice.c 2.64 2012/02/25 12:10:12 kls Exp $ */ #include "dvbdevice.h" @@ -1453,13 +1453,11 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne else needsDetachReceivers = true; } - else if (!IsPrimaryDevice()) - result = true; else - result = Priority >= Setup.PrimaryLimit; + result = true; } else - result = !IsPrimaryDevice() || Priority >= Setup.PrimaryLimit; + result = true; } else needsDetachReceivers = Receiving(true); @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: menu.c 2.37 2012/02/19 11:37:55 kls Exp $ + * $Id: menu.c 2.38 2012/02/25 13:50:49 kls Exp $ */ #include "menu.h" @@ -3093,7 +3093,6 @@ cMenuSetupRecord::cMenuSetupRecord(void) SetSection(tr("Recording")); Add(new cMenuEditIntItem( tr("Setup.Recording$Margin at start (min)"), &data.MarginStart)); Add(new cMenuEditIntItem( tr("Setup.Recording$Margin at stop (min)"), &data.MarginStop)); - Add(new cMenuEditIntItem( tr("Setup.Recording$Primary limit"), &data.PrimaryLimit, 0, MAXPRIORITY)); Add(new cMenuEditIntItem( tr("Setup.Recording$Default priority"), &data.DefaultPriority, 0, MAXPRIORITY)); Add(new cMenuEditIntItem( tr("Setup.Recording$Default lifetime (d)"), &data.DefaultLifetime, 0, MAXLIFETIME)); Add(new cMenuEditStraItem(tr("Setup.Recording$Pause key handling"), &data.PauseKeyHandling, 3, pauseKeyHandlingTexts)); @@ -3654,7 +3653,7 @@ cChannel *cDisplayChannel::NextAvailableChannel(cChannel *Channel, int Direction Channel = Direction > 0 ? Channels.Next(Channel) : Channels.Prev(Channel); if (!Channel && Setup.ChannelsWrap) Channel = Direction > 0 ? Channels.First() : Channels.Last(); - if (Channel && !Channel->GroupSep() && cDevice::GetDevice(Channel, 0, true)) + if (Channel && !Channel->GroupSep() && cDevice::GetDevice(Channel, LIVEPRIORITY, true)) return Channel; } } @@ -4294,7 +4293,7 @@ bool cRecordControls::Start(cTimer *Timer, bool Pause) } } } - else if (!Timer || (Timer->Priority() >= Setup.PrimaryLimit && !Timer->Pending())) { + else if (!Timer || !Timer->Pending()) { isyslog("no free DVB device to record channel %d!", ch); Skins.Message(mtError, tr("No free DVB device to record!")); } @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.7.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2012-02-16 13:18+0100\n" +"POT-Creation-Date: 2012-02-25 14:32+0100\n" "PO-Revision-Date: 2008-10-16 11:16-0400\n" "Last-Translator: Osama Alrawab <alrawab@hotmail.com>\n" "Language-Team: Arabic <ar@li.org>\n" @@ -1053,9 +1053,6 @@ msgstr "" msgid "Setup.Recording$Margin at stop (min)" msgstr "" -msgid "Setup.Recording$Primary limit" -msgstr "الحدود الابتدائية" - msgid "Setup.Recording$Default priority" msgstr "الاولويات الافتراضية" @@ -1367,60 +1364,3 @@ msgstr "اضغط اى زر لالغاء اعادة التشغيل" #, c-format msgid "VDR will shut down in %s minutes" msgstr "البرنامج سيقوم بالاغلاق بعد%s دقيقة " - -#~ msgid "Path" -#~ msgstr "المسار" - -#~ msgid "Timer commands" -#~ msgstr "اوامر الموءقت" - -#~ msgid "Rename recording" -#~ msgstr "اعادة تسمية التسجيل" - -#~ msgid "Date" -#~ msgstr "التاريخ" - -#~ msgid "Length" -#~ msgstr "الطول" - -#~ msgid "Size" -#~ msgstr "الحجم" - -#~ msgid "Delete marks information?" -#~ msgstr "حذف معلومات العلامة" - -#~ msgid "Delete resume information?" -#~ msgstr "حذف معلومات المواصلة" - -#~ msgid "Setup.OSD$Main menu command position" -#~ msgstr "موضع اوامر القائمة الرئسية" - -#~ msgid "Setup.EPG$Show progress bar" -#~ msgstr "اضهار شريط التقدم" - -#~ msgid "Setup.Recording$Max. recording size (GB)" -#~ msgstr "اقصى حجم للتسجيل م ب" - -#~ msgid "Setup.Recording$Hard Link Cutter" -#~ msgstr "قاطع وصلات الاختصرات" - -#~ msgid "Setup.Recording$Show date" -#~ msgstr "اظهر التاريخ" - -#~ msgid "Setup.Recording$Show time" -#~ msgstr "اظهر تاريخ التعديل" - -#~ msgid "Setup.Recording$Show length" -#~ msgstr "اظهر VPS" - -#~ msgid "Rename$Up" -#~ msgstr "اعلى" - -#~ msgid "Rename$Down" -#~ msgstr "اسفل" - -#~ msgid "Rename$Previous" -#~ msgstr "السابق" - -#~ msgid "Rename$Next" -#~ msgstr "التالى" diff --git a/po/ca_ES.po b/po/ca_ES.po index 58e570ee..3e23df96 100644 --- a/po/ca_ES.po +++ b/po/ca_ES.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2012-02-16 13:18+0100\n" +"POT-Creation-Date: 2012-02-25 14:32+0100\n" "PO-Revision-Date: 2008-03-02 19:02+0100\n" "Last-Translator: Luca Olivetti <luca@ventoso.org>\n" "Language-Team: Catalan <vdr@linuxtv.org>\n" @@ -1032,9 +1032,6 @@ msgstr "Marge d'inici de gravaci (min)" msgid "Setup.Recording$Margin at stop (min)" msgstr "Marge de fi de gravaci (min)" -msgid "Setup.Recording$Primary limit" -msgstr "Lmit primari" - msgid "Setup.Recording$Default priority" msgstr "Prioritat per defecte" diff --git a/po/cs_CZ.po b/po/cs_CZ.po index cdf725ae..b37ea0ba 100644 --- a/po/cs_CZ.po +++ b/po/cs_CZ.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.7.14\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2012-02-16 13:18+0100\n" +"POT-Creation-Date: 2012-02-25 14:32+0100\n" "PO-Revision-Date: 2010-05-06 11:00+0200\n" "Last-Translator: Radek Šťastný <dedkus@gmail.com>\n" "Language-Team: Czech <vdr@linuxtv.org>\n" @@ -1031,9 +1031,6 @@ msgstr "Nahrávat před začátkem (min)" msgid "Setup.Recording$Margin at stop (min)" msgstr "Nahrávat po konci (min)" -msgid "Setup.Recording$Primary limit" -msgstr "Primární limit" - msgid "Setup.Recording$Default priority" msgstr "Výchozí priorita" diff --git a/po/da_DK.po b/po/da_DK.po index 7fa4cd96..84eff602 100644 --- a/po/da_DK.po +++ b/po/da_DK.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2012-02-16 13:18+0100\n" +"POT-Creation-Date: 2012-02-25 14:32+0100\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n" "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n" "Language-Team: Danish <vdr@linuxtv.org>\n" @@ -1029,9 +1029,6 @@ msgstr "Margin ved start (min)" msgid "Setup.Recording$Margin at stop (min)" msgstr "Margin ved stop (min)" -msgid "Setup.Recording$Primary limit" -msgstr "Primr grnse" - msgid "Setup.Recording$Default priority" msgstr "Standard prioritet" diff --git a/po/de_DE.po b/po/de_DE.po index 4c369947..5b185e95 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2012-02-16 13:18+0100\n" +"POT-Creation-Date: 2012-02-25 14:32+0100\n" "PO-Revision-Date: 2010-01-16 16:46+0100\n" "Last-Translator: Klaus Schmidinger <kls@tvdr.de>\n" "Language-Team: German <vdr@linuxtv.org>\n" @@ -1029,9 +1029,6 @@ msgstr "Vorlauf zum Timer-Beginn (min)" msgid "Setup.Recording$Margin at stop (min)" msgstr "Nachlauf am Timer-Ende (min)" -msgid "Setup.Recording$Primary limit" -msgstr "Primr-Limit" - msgid "Setup.Recording$Default priority" msgstr "Default-Prioritt" diff --git a/po/el_GR.po b/po/el_GR.po index a4fd80c5..4c4ff123 100644 --- a/po/el_GR.po +++ b/po/el_GR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2012-02-16 13:18+0100\n" +"POT-Creation-Date: 2012-02-25 14:32+0100\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n" "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n" "Language-Team: Greek <vdr@linuxtv.org>\n" @@ -1029,9 +1029,6 @@ msgstr " ()" msgid "Setup.Recording$Margin at stop (min)" msgstr " ()" -msgid "Setup.Recording$Primary limit" -msgstr " " - msgid "Setup.Recording$Default priority" msgstr " " diff --git a/po/es_ES.po b/po/es_ES.po index 3e4cad01..ffcc1b8b 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2012-02-16 13:18+0100\n" +"POT-Creation-Date: 2012-02-25 14:32+0100\n" "PO-Revision-Date: 2008-03-02 19:02+0100\n" "Last-Translator: Luca Olivetti <luca@ventoso.org>\n" "Language-Team: Spanish <vdr@linuxtv.org>\n" @@ -1030,9 +1030,6 @@ msgstr "Comenzar grabacin antes (min)" msgid "Setup.Recording$Margin at stop (min)" msgstr "Acabar grabacin despus (min)" -msgid "Setup.Recording$Primary limit" -msgstr "Lmite primario" - msgid "Setup.Recording$Default priority" msgstr "Prioridad por defecto" diff --git a/po/et_EE.po b/po/et_EE.po index b68776ba..e4a9e19e 100644 --- a/po/et_EE.po +++ b/po/et_EE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2012-02-20 13:18+0100\n" +"POT-Creation-Date: 2012-02-25 14:32+0100\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n" "Last-Translator: Arthur Konovalov <artlov@gmail.com>\n" "Language-Team: Estonian <vdr@linuxtv.org>\n" @@ -1029,9 +1029,6 @@ msgstr "Salvestamise algusvaru (min)" msgid "Setup.Recording$Margin at stop (min)" msgstr "Salvestamise lõpuvaru (min)" -msgid "Setup.Recording$Primary limit" -msgstr "Esmane prioriteet" - msgid "Setup.Recording$Default priority" msgstr "Vaikimisi prioriteet" diff --git a/po/fi_FI.po b/po/fi_FI.po index 942286cc..365862df 100644 --- a/po/fi_FI.po +++ b/po/fi_FI.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2012-02-16 13:18+0100\n" +"POT-Creation-Date: 2012-02-25 14:32+0100\n" "PO-Revision-Date: 2007-08-15 15:52+0200\n" "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n" "Language-Team: Finnish <vdr@linuxtv.org>\n" @@ -1032,9 +1032,6 @@ msgstr "Aloitusmarginaali (min)" msgid "Setup.Recording$Margin at stop (min)" msgstr "Lopetusmarginaali (min)" -msgid "Setup.Recording$Primary limit" -msgstr "Ensisijaisen sovittimen prioriteettiraja" - msgid "Setup.Recording$Default priority" msgstr "Tallenteen oletusprioriteetti" diff --git a/po/fr_FR.po b/po/fr_FR.po index 32e23f5d..e8577be6 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2012-02-16 13:18+0100\n" +"POT-Creation-Date: 2012-02-25 14:32+0100\n" "PO-Revision-Date: 2008-02-27 18:14+0100\n" "Last-Translator: Jean-Claude Repetto <jc@repetto.org>\n" "Language-Team: French <vdr@linuxtv.org>\n" @@ -1035,9 +1035,6 @@ msgstr "Marge antrieure (min)" msgid "Setup.Recording$Margin at stop (min)" msgstr "Marge postrieure (min)" -msgid "Setup.Recording$Primary limit" -msgstr "Limite primaire" - msgid "Setup.Recording$Default priority" msgstr "Priorit par dfaut" diff --git a/po/hr_HR.po b/po/hr_HR.po index f2c2795b..86d93496 100644 --- a/po/hr_HR.po +++ b/po/hr_HR.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2012-02-16 13:18+0100\n" +"POT-Creation-Date: 2012-02-25 14:32+0100\n" "PO-Revision-Date: 2008-03-17 19:00+0100\n" "Last-Translator: Adrian Caval <anrxc@sysphere.org>\n" "Language-Team: Croatian <vdr@linuxtv.org>\n" @@ -1031,9 +1031,6 @@ msgstr "Rezerva na poetku snimanja (min)" msgid "Setup.Recording$Margin at stop (min)" msgstr "Rezerva na kraju (min)" -msgid "Setup.Recording$Primary limit" -msgstr "Standardno ogranienje" - msgid "Setup.Recording$Default priority" msgstr "Zadani prioritet" diff --git a/po/hu_HU.po b/po/hu_HU.po index a457e266..cfd20bd1 100644 --- a/po/hu_HU.po +++ b/po/hu_HU.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2012-02-16 13:18+0100\n" +"POT-Creation-Date: 2012-02-25 14:32+0100\n" "PO-Revision-Date: 2012-01-02 11:54+0200\n" "Last-Translator: Istvn Fley <ifuley@tigercomp.ro>\n" "Language-Team: Hungarian <vdr@linuxtv.org>\n" @@ -1033,9 +1033,6 @@ msgstr "Ideltols a kezdsnl (perc)" msgid "Setup.Recording$Margin at stop (min)" msgstr "Ideltols a befejezsnl (perc)" -msgid "Setup.Recording$Primary limit" -msgstr "Als priorits hatr" - msgid "Setup.Recording$Default priority" msgstr "Alaprtelmezett priorits" diff --git a/po/it_IT.po b/po/it_IT.po index e7f9f925..3cbd2c03 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2012-02-16 13:18+0100\n" +"POT-Creation-Date: 2012-02-25 14:32+0100\n" "PO-Revision-Date: 2012-01-15 19:11+0100\n" "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n" "Language-Team: Italian <vdr@linuxtv.org>\n" @@ -1036,9 +1036,6 @@ msgstr "Margine iniziale (min)" msgid "Setup.Recording$Margin at stop (min)" msgstr "Margine finale (min)" -msgid "Setup.Recording$Primary limit" -msgstr "Limite primario" - msgid "Setup.Recording$Default priority" msgstr "Priorità predefinita" diff --git a/po/lt_LT.po b/po/lt_LT.po index ab7b4063..c7e2bb78 100644 --- a/po/lt_LT.po +++ b/po/lt_LT.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.7.16\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2012-02-16 13:18+0100\n" +"POT-Creation-Date: 2012-02-25 14:32+0100\n" "PO-Revision-Date: 2010-10-30 11:55+0200\n" "Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n" "Language-Team: Lithuanian <vdr@linuxtv.org>\n" @@ -1029,9 +1029,6 @@ msgstr "Įrašo pradžios užlaikymo laikas (min)" msgid "Setup.Recording$Margin at stop (min)" msgstr "Įrašo pabaigos užlaikymo laikas (min)" -msgid "Setup.Recording$Primary limit" -msgstr "Pagrindinio įvesties įrenginio suderinimo prioritetas" - msgid "Setup.Recording$Default priority" msgstr "Numatytas laikmačio prioritetas" diff --git a/po/mk_MK.po b/po/mk_MK.po index 5fbd7b62..f8ac586b 100644 --- a/po/mk_MK.po +++ b/po/mk_MK.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR-1.7.14\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2012-02-16 13:18+0100\n" +"POT-Creation-Date: 2012-02-25 14:32+0100\n" "PO-Revision-Date: 2010-03-11 00:54+0100\n" "Last-Translator: Dimitar Petrovski <dimeptr@gmail.com>\n" "Language-Team: Macedonian <en@li.org>\n" @@ -1030,9 +1030,6 @@ msgstr "Резерва на почеток на снимање (мин)" msgid "Setup.Recording$Margin at stop (min)" msgstr "Резерва на крајот на снимање (мин)" -msgid "Setup.Recording$Primary limit" -msgstr "Стандардно огранучување" - msgid "Setup.Recording$Default priority" msgstr "Зададен приоритет" diff --git a/po/nl_NL.po b/po/nl_NL.po index 5b9f400a..d96ff114 100644 --- a/po/nl_NL.po +++ b/po/nl_NL.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2012-02-16 13:18+0100\n" +"POT-Creation-Date: 2012-02-25 14:32+0100\n" "PO-Revision-Date: 2008-02-26 17:20+0100\n" "Last-Translator: Johan Schuring <johan.schuring@vetteblei.nl>\n" "Language-Team: Dutch <vdr@linuxtv.org>\n" @@ -1033,9 +1033,6 @@ msgstr "Tijd marge begin (min)" msgid "Setup.Recording$Margin at stop (min)" msgstr "Tijd marge eind (min)" -msgid "Setup.Recording$Primary limit" -msgstr "Eerste grens" - msgid "Setup.Recording$Default priority" msgstr "Standaard prioriteit" diff --git a/po/nn_NO.po b/po/nn_NO.po index 1e5bc9c8..63643958 100644 --- a/po/nn_NO.po +++ b/po/nn_NO.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2012-02-16 13:18+0100\n" +"POT-Creation-Date: 2012-02-25 14:32+0100\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n" "Last-Translator: Truls Slevigen <truls@slevigen.no>\n" "Language-Team: Norwegian Nynorsk <vdr@linuxtv.org>\n" @@ -1030,9 +1030,6 @@ msgstr "Opptaksmargin start (min)" msgid "Setup.Recording$Margin at stop (min)" msgstr "Opptaksmargin slutt (min)" -msgid "Setup.Recording$Primary limit" -msgstr "Prioritetsgrense HovedDVB" - msgid "Setup.Recording$Default priority" msgstr "Normal prioritet (Timer)" diff --git a/po/pl_PL.po b/po/pl_PL.po index 6b3195ed..40ef3011 100644 --- a/po/pl_PL.po +++ b/po/pl_PL.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2012-02-16 13:18+0100\n" +"POT-Creation-Date: 2012-02-25 14:32+0100\n" "PO-Revision-Date: 2008-03-09 12:59+0100\n" "Last-Translator: Michael Rakowski <mrak@gmx.de>\n" "Language-Team: Polish <vdr@linuxtv.org>\n" @@ -1030,9 +1030,6 @@ msgstr "Margines na pocztku (min)" msgid "Setup.Recording$Margin at stop (min)" msgstr "Margines na kocu (min)" -msgid "Setup.Recording$Primary limit" -msgstr "Podstawowy limit" - msgid "Setup.Recording$Default priority" msgstr "Domylny priorytet" diff --git a/po/pt_PT.po b/po/pt_PT.po index f17ab906..b65937c9 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.7.15\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2012-02-16 13:18+0100\n" +"POT-Creation-Date: 2012-02-25 14:32+0100\n" "PO-Revision-Date: 2010-03-28 22:49+0100\n" "Last-Translator: Cris Silva <hudokkow@gmail.com>\n" "Language-Team: Portuguese <vdr@linuxtv.org>\n" @@ -1030,9 +1030,6 @@ msgstr "Margem de incio (min)" msgid "Setup.Recording$Margin at stop (min)" msgstr "Margem do fim (min)" -msgid "Setup.Recording$Primary limit" -msgstr "Limite primrio" - msgid "Setup.Recording$Default priority" msgstr "PPrioridade padro" diff --git a/po/ro_RO.po b/po/ro_RO.po index 7e0046a8..5ee348c9 100644 --- a/po/ro_RO.po +++ b/po/ro_RO.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.7.12\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2012-02-16 13:18+0100\n" +"POT-Creation-Date: 2012-02-25 14:32+0100\n" "PO-Revision-Date: 2011-03-10 23:52+0100\n" "Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n" "Language-Team: Romanian <vdr@linuxtv.org>\n" @@ -1032,9 +1032,6 @@ msgstr "Marj la pornire (min)" msgid "Setup.Recording$Margin at stop (min)" msgstr "Marj la oprire (min)" -msgid "Setup.Recording$Primary limit" -msgstr "Limit primar" - msgid "Setup.Recording$Default priority" msgstr "Prioritate implicit" diff --git a/po/ru_RU.po b/po/ru_RU.po index 2ead7963..94e1a17b 100644 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2012-02-16 13:18+0100\n" +"POT-Creation-Date: 2012-02-25 14:32+0100\n" "PO-Revision-Date: 2008-12-15 14:37+0100\n" "Last-Translator: Oleg Roitburd <oleg@roitburd.de>\n" "Language-Team: Russian <vdr@linuxtv.org>\n" @@ -1030,9 +1030,6 @@ msgstr " ()" msgid "Setup.Recording$Margin at stop (min)" msgstr " ()" -msgid "Setup.Recording$Primary limit" -msgstr ". . " - msgid "Setup.Recording$Default priority" msgstr " " diff --git a/po/sk_SK.po b/po/sk_SK.po index e6140e4d..76778952 100644 --- a/po/sk_SK.po +++ b/po/sk_SK.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.7.16\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2012-02-16 13:18+0100\n" +"POT-Creation-Date: 2012-02-25 14:32+0100\n" "PO-Revision-Date: 2011-02-15 16:29+0100\n" "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n" "Language-Team: Slovak <vdr@linuxtv.org>\n" @@ -1029,9 +1029,6 @@ msgstr "Nahrva pred zaiatkom (min)" msgid "Setup.Recording$Margin at stop (min)" msgstr "Nahrva po konci (min)" -msgid "Setup.Recording$Primary limit" -msgstr "Hlavn limit" - msgid "Setup.Recording$Default priority" msgstr "Predvolen priorita" diff --git a/po/sl_SI.po b/po/sl_SI.po index e0b7e024..97b41e38 100644 --- a/po/sl_SI.po +++ b/po/sl_SI.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2012-02-16 13:18+0100\n" +"POT-Creation-Date: 2012-02-25 14:32+0100\n" "PO-Revision-Date: 2008-02-28 19:44+0100\n" "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n" "Language-Team: Slovenian <vdr@linuxtv.org>\n" @@ -1030,9 +1030,6 @@ msgstr "Premik zaetka snemanja (min)" msgid "Setup.Recording$Margin at stop (min)" msgstr "Zamik konca snemanja (min)" -msgid "Setup.Recording$Primary limit" -msgstr "Primarna meja" - msgid "Setup.Recording$Default priority" msgstr "Privzeta prioriteta" diff --git a/po/sr_SR.po b/po/sr_SR.po index 9b58e1e7..f86250f6 100644 --- a/po/sr_SR.po +++ b/po/sr_SR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.7.1\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2012-02-16 13:18+0100\n" +"POT-Creation-Date: 2012-02-25 14:32+0100\n" "PO-Revision-Date: 2011-01-09 15:57+0100\n" "Last-Translator: Milan Cvijanovi <elcom_cvijo@hotmail.com>\n" "Language-Team: Serbian <vdr@linuxtv.org>\n" @@ -1051,9 +1051,6 @@ msgstr "Rezerva na poetku snimanja (min)" msgid "Setup.Recording$Margin at stop (min)" msgstr "Rezerva na kraju (min)" -msgid "Setup.Recording$Primary limit" -msgstr "Standardno ogranienje" - msgid "Setup.Recording$Default priority" msgstr "Zadani prioritet" diff --git a/po/sv_SE.po b/po/sv_SE.po index e79633ea..fedf8d8e 100644 --- a/po/sv_SE.po +++ b/po/sv_SE.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2012-02-16 13:18+0100\n" +"POT-Creation-Date: 2012-02-25 14:32+0100\n" "PO-Revision-Date: 2008-03-12 18:25+0100\n" "Last-Translator: Magnus Andersson <svankan@bahnhof.se>\n" "Language-Team: Swedish <vdr@linuxtv.org>\n" @@ -1032,9 +1032,6 @@ msgstr "Marginal fr start (min)" msgid "Setup.Recording$Margin at stop (min)" msgstr "Marginal fr stopp (min)" -msgid "Setup.Recording$Primary limit" -msgstr "Primr grns" - msgid "Setup.Recording$Default priority" msgstr "Normal prioritet" diff --git a/po/tr_TR.po b/po/tr_TR.po index 3a86e791..8275596e 100644 --- a/po/tr_TR.po +++ b/po/tr_TR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2012-02-16 13:18+0100\n" +"POT-Creation-Date: 2012-02-25 14:32+0100\n" "PO-Revision-Date: 2008-02-28 00:33+0100\n" "Last-Translator: Oktay Yolgeen <oktay_73@yahoo.de>\n" "Language-Team: Turkish <vdr@linuxtv.org>\n" @@ -1029,9 +1029,6 @@ msgstr "Banda tolerans (dak)" msgid "Setup.Recording$Margin at stop (min)" msgstr "Sonunda tolerans (dak)" -msgid "Setup.Recording$Primary limit" -msgstr "Primer limit" - msgid "Setup.Recording$Default priority" msgstr "Olaan priorite" diff --git a/po/uk_UA.po b/po/uk_UA.po index 6eebe92c..1e10ad7e 100644 --- a/po/uk_UA.po +++ b/po/uk_UA.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.7.7\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2012-02-16 13:18+0100\n" +"POT-Creation-Date: 2012-02-25 14:32+0100\n" "PO-Revision-Date: 2010-04-25 16:35+0200\n" "Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n" "Language-Team: Ukrainian <vdr@linuxtv.org>\n" @@ -1029,9 +1029,6 @@ msgstr "Випередження початку запису (хв)" msgid "Setup.Recording$Margin at stop (min)" msgstr "Запізнення зупинки запису (хв)" -msgid "Setup.Recording$Primary limit" -msgstr "Мін. пріоритет захоплення осн. пристрою" - msgid "Setup.Recording$Default priority" msgstr "Пріоритет таймера по замовчуванню" diff --git a/po/zh_CN.po b/po/zh_CN.po index 05c93372..6504bafb 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2012-02-16 13:18+0100\n" +"POT-Creation-Date: 2012-02-25 14:32+0100\n" "PO-Revision-Date: 2009-09-23 23:50+0800\n" "Last-Translator: Nan Feng <nfgx@21cn.com>\n" "Language-Team: Chinese (simplified) <vdr@linuxtv.org>\n" @@ -1032,9 +1032,6 @@ msgstr "时间正在开始 (min)" msgid "Setup.Recording$Margin at stop (min)" msgstr "时间正在停止 (min)" -msgid "Setup.Recording$Primary limit" -msgstr "主要限制" - msgid "Setup.Recording$Default priority" msgstr "默认优先" @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: receiver.h 2.3 2012/02/25 11:19:53 kls Exp $ + * $Id: receiver.h 2.4 2012/02/25 12:49:31 kls Exp $ */ #ifndef __RECEIVER_H @@ -49,7 +49,7 @@ public: ///< Otherwise pids can be added to the receiver by separate calls to the AddPid[s] ///< functions. ///< The total number of PIDs added to a receiver must not exceed MAXRECEIVEPIDS. - ///< Priority may be any value in the range -99..99. Negative values indicate + ///< Priority may be any value in the range +/-MAXPRIORITY. Negative values indicate ///< that this cReceiver may be detached at any time (without blocking the ///< cDevice it is attached to). virtual ~cReceiver(); |