diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 39bc0d38..6219f2af 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -280,6 +280,7 @@ Uwe Scheffler for reporting a problem with frozen live view in conjunction with device bonding for reporting a problem in handling the PrimaryLimit when requesting a device for live viewing + for reporting a black screen while a "Recording started" message is displayed Matjaz Thaler for improving AC3 decoding when replaying DVDs @@ -2384,6 +2385,7 @@ Tobias Grimm for avoiding a gcc 4.6 compiler error in the skincurses plugin. for suggesting to move setting LC_NUMERIC further up to make sure any floating point numbers use a decimal point + for adding dependency on 'i18n' to 'install-i18n' in the VDR Makefile Helge Lenz for reporting a bug in setting the 'Delta' parameter when calling the shutdown @@ -2735,6 +2737,7 @@ Derek Kelly (user.vdr@gmail.com) for reporting a problem with getting the maximum short channel name length in case there are no short names at all for reporting an incompatible change from DTV_DVBT2_PLP_ID to DTV_STREAM_ID in DVB API 5.8 + for reporting a missing template for DVBDIR in Make.config.template Marcel Unbehaun for adding cRecordingInfo::GetEvent() @@ -3025,6 +3028,7 @@ S for simplifying calculating the PTS offset in cPtsFixer::Fix() and fixing the overflow handling of PCR values for improving cutting MPEG-2 video + for pointing out that FindHeader() can also be used in cMpeg2Fixer::AdjTref() Peter Münster for fixing 'make install' to not overwrite existing configuration files diff --git a/HISTORY b/HISTORY index 11cad93e..43eca18c 100644 --- a/HISTORY +++ b/HISTORY @@ -7533,3 +7533,54 @@ Video Disk Recorder Revision History - Improved cutting MPEG-2 video (thanks to Sören Moch). - Reduced the number of retries in cTransfer::Receive() to avoid blocking recordings in case the primary device can't handle the current live signal. + +2013-02-08: Version 1.7.37 + +- Now also using FindHeader() in cMpeg2Fixer::AdjTref() (pointed out by Sören Moch). +- Added missing template for DVBDIR to Make.config.template (reported by Derek Kelly). +- The LCARS menu now also works if the OSD has only 1bpp (two colors). +- Fixed possible garbage in the remaining time of the LCARS replay display in case the + hours change from two to one digit. +- Fixed upscaling bitmaps. The last row and column of the scaled bitmap was not filled, + which resulted in empty lines between scaled subtitles. +- Fixed a leftover line in case a two line subtitle was followed by a one line + subtitle on the dvbhddevice in "high level" OSD mode. +- Returning 0 from cDvbSdFfDevice::NumProvidedSystems() if option --outputonly is given. +- The index file is now closed after initially reading it if it is older than 3600 seconds. +- Improved responsiveness during replay when close to the recording's end. +- Fixed a leftover progress display in the LCARS main menu when replay of a recording + ends while the menu is open, and the live channel has no EPG information. +- Fixed possible audio chatter when a recording is replayed to its very end. +- Added dependency on 'i18n' to 'install-i18n' in the VDR Makefile (thanks to Tobias + Grimm). +- Changed several calls to Skins.Message() in vdr.c to Skins.QueueMessage() in order to + avoid a black screen while such a message is displayed in case the channel will be + switched (reported by Uwe Scheffler). +- Updated the Slovakian language texts (thanks to Milan Hrala). +- Improved LIRC timing for repeat function. +- When pausing live video, the current audio and subtitle tracks are now retained. +- Added some notes about plugin Makefiles to PLUGINS.html. +- Avoiding an extra key press event if the repeat function kicks in when controlling + VDR via the PC keyboard. +- The new options "Setup/Miscellaneous/Remote control repeat delay" and + "Setup/Miscellaneous/Remote control repeat delta" can be used to adjust the + behavior of the remote control in case a key is held pressed down for a while, so + that the repeat function kicks in (see MANUAL). + The builtin LIRC and KBD remote controls already use these parameters. It is + recommended that plugins that implement an interface to any kind of remote controls + also use the parameters Setup.RcRepeatDelay and Setup.RcRepeatDelta for the desired + purpose, and remove any setup options they might have that serve the same purpose. +- cTimer no longer does any special "VFAT" handling to shorten directory names to 40 + characters. When a string is used as a directory name for a recording, the maximum + length of the directory path, as well as the individual directory names, is now + limited to the values specified by the new command line option --dirnames (see + man vdr(1) for details). For backwards compatibility the option --vfat is still + available and has the same effect as --dirnames=250,40,1. +- The macro MaxFileName is now obsolete and may be removed in future versions. Use + NAME_MAX directly instead. +- There is no more fixed limit to the maximum number of cPixmap objects an OSD can + create. However, a particular device may still be unable to create an arbitrary + number of pixmaps, due to limited resources. So it's always a good idea to use + as few pixmaps as possible. +- Fixed formatting and removed some superfluous break statements in vdr.c's command + line option switch. diff --git a/INSTALL b/INSTALL index 7654c2a9..2cf6be33 100644 --- a/INSTALL +++ b/INSTALL @@ -58,8 +58,10 @@ Alternatively you can use the '--lirc' option at runtime. This option accepts an optional path to the remote control device, the default of which can be set via the LIRC_DEVICE macro. -If your video directory will be on a VFAT partition, you can call VDR with -the command line option '--vfat'. +If you want to make your video directory available to other machines that +have limitations on directory name lengths and/or allowed characters in +directory names, you can call VDR with the command line option '--dirnames' +(see man vdr(1) for details). When running, the 'vdr' program writes status information into the system log file, which is usually /var/log/messages (or /var/log/user.log, diff --git a/MANUAL b/MANUAL index 2337d192..72189fa7 100644 --- a/MANUAL +++ b/MANUAL @@ -926,6 +926,18 @@ Version 1.6 key. Note that the total maximum is also limited by the "OSD/Channel info time" parameter. + Remote control repeat delay = 300 + The earliest time (in milliseconds) after which the repeat + function of the remote control kicks in if a key is held + pressed down for a while. If the remote control in use + has a repeat delay that is longer than that given in this + parameter, that longer delay will prevail. + Remote control repeat delta = 100 + The time (in milliseconds) between two subsequent key + presses generated by the remote control's repeat function. + If the remote control in use has a repeat delta that is + longer than that given in this parameter, that longer delay + will prevail. Initial channel = The channel ID of the channel that shall be tuned to when VDR starts. Default is empty, which means that it will tune to the channel that was on before VDR was stopped. diff --git a/Make.config.template b/Make.config.template index f37f17f0..b02d796e 100644 --- a/Make.config.template +++ b/Make.config.template @@ -6,7 +6,7 @@ # See the main source file 'vdr.c' for copyright information and # how to reach the author. # -# $Id: Make.config.template 2.16 2013/01/12 13:50:17 kls Exp $ +# $Id: Make.config.template 2.18 2013/02/08 10:31:38 kls Exp $ ### The C compiler and options: @@ -34,6 +34,7 @@ endif #MANDIR = $(PREFIX)/share/man #PCDIR = $(PREFIX)/lib/pkgconfig #RESDIR = $(PREFIX)/share/vdr +#DVBDIR = /usr/src/v4l-dvb/linux/include/uapi #VIDEODIR = /srv/vdr/video #CONFDIR = /var/lib/vdr diff --git a/Makefile b/Makefile index 2a5a9b2d..47e954fd 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ # See the main source file 'vdr.c' for copyright information and # how to reach the author. # -# $Id: Makefile 2.49 2013/01/12 13:45:01 kls Exp $ +# $Id: Makefile 2.50 2013/01/27 14:19:49 kls Exp $ .DELETE_ON_ERROR: @@ -183,7 +183,7 @@ $(I18Nmsgs): $(LOCALEDIR)/%/LC_MESSAGES/vdr.mo: $(PODIR)/%.mo .PHONY: i18n i18n: $(I18Nmsgs) -install-i18n: +install-i18n: i18n @mkdir -p $(DESTDIR)$(LOCDIR) cp -r $(LOCALEDIR)/* $(DESTDIR)$(LOCDIR) diff --git a/PLUGINS.html b/PLUGINS.html index 0c7d223a..a5713a7f 100644 --- a/PLUGINS.html +++ b/PLUGINS.html @@ -173,9 +173,15 @@ The src directory contains one subdirectory for each plugin, which carr the name of that plugin (in the above example that would be hello). What's inside the individual source directory of a plugin is entirely up to the author of that plugin. The only prerequisites are -that there is a Makefile that provides the targets all and +that there is a Makefile that provides the targets all, install and clean, and that a call to make all actually produces a dynamically loadable library file for that plugin (we'll get to the details later). + +The dynamically loadable library file for the plugin shall be located directly under +the plugin's source directory. +See the section Initializing a new plugin directory +for how to generate an example Makefile. +

The lib directory contains the dynamically loadable libraries of all available plugins. Note that the names of these files are created by concatenating @@ -2215,6 +2221,13 @@ Put(uint64 Code, bool Repeat = false, bool Release = false);

The other parameters have the same meaning as in the first version of this function. +

+ +If your remote control has a repeat function that automatically repeats key events +if a key is held pressed down for a while, your derived class should use the global +parameters Setup.RcRepeatDelay and Setup.RcRepeatDelta to allow +users to configure the behavior of this function. +

Conditional Access

diff --git a/PLUGINS/src/dvbhddevice/HISTORY b/PLUGINS/src/dvbhddevice/HISTORY index 23320197..ceee7da8 100644 --- a/PLUGINS/src/dvbhddevice/HISTORY +++ b/PLUGINS/src/dvbhddevice/HISTORY @@ -51,3 +51,7 @@ VDR Plugin 'dvbhddevice' Revision History 2013-01-12: Version 0.0.6 - Adapted Makefile to changes introduced in recent VDR versions. + +2013-01-24: Version 0.0.7 + +- Fixed cHdffOsd::SetAreas() (didn't clear the OSD). diff --git a/PLUGINS/src/dvbhddevice/dvbhddevice.c b/PLUGINS/src/dvbhddevice/dvbhddevice.c index faf6c5cb..4d755f69 100644 --- a/PLUGINS/src/dvbhddevice/dvbhddevice.c +++ b/PLUGINS/src/dvbhddevice/dvbhddevice.c @@ -3,7 +3,7 @@ * * See the README file for copyright information and how to reach the author. * - * $Id: dvbhddevice.c 1.19 2013/01/12 14:11:35 kls Exp $ + * $Id: dvbhddevice.c 1.21 2013/01/29 08:59:36 kls Exp $ */ #include @@ -12,7 +12,7 @@ #include "menu.h" #include "setup.h" -static const char *VERSION = "0.0.6"; +static const char *VERSION = "0.0.7"; static const char *DESCRIPTION = trNOOP("HD Full Featured DVB device"); static const char *MAINMENUENTRY = "dvbhddevice"; @@ -26,6 +26,7 @@ public: virtual const char *Version(void) { return VERSION; } virtual const char *Description(void) { return tr(DESCRIPTION); } virtual void MainThreadHook(void); + virtual void Stop(void); virtual const char *MainMenuEntry(void); virtual cOsdObject *MainMenuAction(void); virtual cMenuSetupPage *SetupMenu(void); @@ -60,6 +61,19 @@ void cPluginDvbhddevice::MainThreadHook(void) } } +void cPluginDvbhddevice::Stop(void) +{ + if (gHdffSetup.CecEnabled && gHdffSetup.CecTvOff) + { + HDFF::cHdffCmdIf * hdffCmdIf = cDvbHdFfDevice::GetHdffCmdHandler(); + if (hdffCmdIf) + { + hdffCmdIf->CmdHdmiSendCecCommand(HDFF_CEC_COMMAND_TV_OFF); + isyslog("HDFF_CEC_COMMAND_TV_OFF"); + } + } +} + const char *cPluginDvbhddevice::MainMenuEntry(void) { return gHdffSetup.HideMainMenu ? NULL : MAINMENUENTRY; diff --git a/PLUGINS/src/dvbhddevice/dvbhdffdevice.c b/PLUGINS/src/dvbhddevice/dvbhdffdevice.c index e81d93b9..f25d0b76 100644 --- a/PLUGINS/src/dvbhddevice/dvbhdffdevice.c +++ b/PLUGINS/src/dvbhddevice/dvbhdffdevice.c @@ -3,7 +3,7 @@ * * See the README file for copyright information and how to reach the author. * - * $Id: dvbhdffdevice.c 1.47 2012/12/29 13:23:22 kls Exp $ + * $Id: dvbhdffdevice.c 1.48 2013/01/29 08:59:36 kls Exp $ */ #include @@ -96,10 +96,6 @@ cDvbHdFfDevice::~cDvbHdFfDevice() delete spuDecoder; if (isHdffPrimary) { - if (gHdffSetup.CecEnabled && gHdffSetup.CecTvOff) - { - mHdffCmdIf->CmdHdmiSendCecCommand(HDFF_CEC_COMMAND_TV_OFF); - } delete mHdffCmdIf; } // We're not explicitly closing any device files here, since this sometimes diff --git a/PLUGINS/src/dvbhddevice/hdffosd.c b/PLUGINS/src/dvbhddevice/hdffosd.c index 5d55c957..09d370ed 100644 --- a/PLUGINS/src/dvbhddevice/hdffosd.c +++ b/PLUGINS/src/dvbhddevice/hdffosd.c @@ -3,7 +3,7 @@ * * See the README file for copyright information and how to reach the author. * - * $Id: hdffosd.c 1.18 2012/11/15 09:20:24 kls Exp $ + * $Id: hdffosd.c 1.20 2013/01/29 08:59:36 kls Exp $ */ #include "hdffosd.h" @@ -38,7 +38,6 @@ private: int mTop; int mDispWidth; int mDispHeight; - bool shown; bool mChanged; uint32_t mDisplay; tFontFace mFontFaces[MAX_NUM_FONTFACES]; @@ -77,7 +76,6 @@ cHdffOsd::cHdffOsd(int Left, int Top, HDFF::cHdffCmdIf * pHdffCmdIf, uint Level) mHdffCmdIf = pHdffCmdIf; mLeft = Left; mTop = Top; - shown = false; mChanged = false; mBitmapPalette = HDFF_INVALID_HANDLE; @@ -154,11 +152,10 @@ eOsdError cHdffOsd::SetAreas(const tArea *Areas, int NumAreas) { //printf("SetAreas %d: %d %d %d %d %d\n", i, Areas[i].x1, Areas[i].y1, Areas[i].x2, Areas[i].y2, Areas[i].bpp); } - if (shown) + if (mDisplay != HDFF_INVALID_HANDLE) { mHdffCmdIf->CmdOsdDrawRectangle(mDisplay, 0, 0, mDispWidth, mDispHeight, 0); mHdffCmdIf->CmdOsdRenderDisplay(mDisplay); - shown = false; } error = cOsd::SetAreas(Areas, NumAreas); @@ -180,11 +177,10 @@ void cHdffOsd::SetActive(bool On) if (GetBitmap(0)) // only flush here if there are already bitmaps Flush(); } - else if (shown) + else if (mDisplay != HDFF_INVALID_HANDLE) { mHdffCmdIf->CmdOsdDrawRectangle(mDisplay, 0, 0, mDispWidth, mDispHeight, 0); mHdffCmdIf->CmdOsdRenderDisplay(mDisplay); - shown = false; } } } diff --git a/PLUGINS/src/dvbsddevice/HISTORY b/PLUGINS/src/dvbsddevice/HISTORY index 5cca3ec2..e1f98548 100644 --- a/PLUGINS/src/dvbsddevice/HISTORY +++ b/PLUGINS/src/dvbsddevice/HISTORY @@ -37,3 +37,7 @@ VDR Plugin 'dvbsddevice' Revision History 2013-01-12: Version 0.0.8 - Adapted Makefile to changes introduced in recent VDR versions. + +2013-01-25: Version 0.0.9 + +- Returning 0 from cDvbSdFfDevice::NumProvidedSystems() if option --outputonly is given. diff --git a/PLUGINS/src/dvbsddevice/dvbsddevice.c b/PLUGINS/src/dvbsddevice/dvbsddevice.c index 7f91d404..8ebfe2b6 100644 --- a/PLUGINS/src/dvbsddevice/dvbsddevice.c +++ b/PLUGINS/src/dvbsddevice/dvbsddevice.c @@ -3,14 +3,14 @@ * * See the README file for copyright information and how to reach the author. * - * $Id: dvbsddevice.c 1.8 2013/01/12 14:12:07 kls Exp $ + * $Id: dvbsddevice.c 1.9 2013/01/25 10:48:50 kls Exp $ */ #include #include #include "dvbsdffdevice.h" -static const char *VERSION = "0.0.8"; +static const char *VERSION = "0.0.9"; static const char *DESCRIPTION = "SD Full Featured DVB device"; class cPluginDvbsddevice : public cPlugin { diff --git a/PLUGINS/src/dvbsddevice/dvbsdffdevice.c b/PLUGINS/src/dvbsddevice/dvbsdffdevice.c index 56018792..f9ff5b32 100644 --- a/PLUGINS/src/dvbsddevice/dvbsdffdevice.c +++ b/PLUGINS/src/dvbsddevice/dvbsdffdevice.c @@ -3,7 +3,7 @@ * * See the README file for copyright information and how to reach the author. * - * $Id: dvbsdffdevice.c 2.33 2012/03/11 13:32:42 kls Exp $ + * $Id: dvbsdffdevice.c 2.34 2013/01/25 10:48:29 kls Exp $ */ #include "dvbsdffdevice.h" @@ -362,6 +362,13 @@ bool cDvbSdFfDevice::ProvidesSource(int Source) const return cDvbDevice::ProvidesSource(Source); } +int cDvbSdFfDevice::NumProvidedSystems(void) const +{ + if (outputOnly) + return 0; + return cDvbDevice::NumProvidedSystems(); +} + void cDvbSdFfDevice::TurnOffLiveMode(bool LiveView) { if (LiveView) { diff --git a/PLUGINS/src/dvbsddevice/dvbsdffdevice.h b/PLUGINS/src/dvbsddevice/dvbsdffdevice.h index 79b4e3d8..dc55148f 100644 --- a/PLUGINS/src/dvbsddevice/dvbsdffdevice.h +++ b/PLUGINS/src/dvbsddevice/dvbsdffdevice.h @@ -3,7 +3,7 @@ * * See the README file for copyright information and how to reach the author. * - * $Id: dvbsdffdevice.h 2.14 2012/12/03 13:43:55 kls Exp $ + * $Id: dvbsdffdevice.h 2.15 2013/01/25 10:43:14 kls Exp $ */ #ifndef __DVBSDFFDEVICE_H @@ -37,6 +37,7 @@ public: public: virtual bool ProvidesSource(int Source) const; + virtual int NumProvidedSystems(void) const; private: void TurnOffLiveMode(bool LiveView); protected: diff --git a/config.c b/config.c index 8c7b9d1d..b4228931 100644 --- a/config.c +++ b/config.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: config.c 2.32 2013/01/17 14:50:51 kls Exp $ + * $Id: config.c 2.34 2013/02/05 11:16:08 kls Exp $ */ #include "config.h" @@ -408,6 +408,8 @@ cSetup::cSetup(void) SVDRPTimeout = 300; ZapTimeout = 3; ChannelEntryTimeout = 1000; + RcRepeatDelay = 300; + RcRepeatDelta = 100; DefaultPriority = 50; DefaultLifetime = MAXLIFETIME; PauseKeyHandling = 2; @@ -585,7 +587,7 @@ bool cSetup::Parse(const char *Name, const char *Value) else if (!strcasecmp(Name, "MenuScrollWrap")) MenuScrollWrap = atoi(Value); else if (!strcasecmp(Name, "MenuKeyCloses")) MenuKeyCloses = atoi(Value); else if (!strcasecmp(Name, "MarkInstantRecord")) MarkInstantRecord = atoi(Value); - else if (!strcasecmp(Name, "NameInstantRecord")) Utf8Strn0Cpy(NameInstantRecord, Value, MaxFileName); + else if (!strcasecmp(Name, "NameInstantRecord")) Utf8Strn0Cpy(NameInstantRecord, Value, sizeof(NameInstantRecord)); else if (!strcasecmp(Name, "InstantRecordTime")) InstantRecordTime = atoi(Value); else if (!strcasecmp(Name, "LnbSLOF")) LnbSLOF = atoi(Value); else if (!strcasecmp(Name, "LnbFrequLo")) LnbFrequLo = atoi(Value); @@ -610,6 +612,8 @@ 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, "RcRepeatDelay")) RcRepeatDelay = atoi(Value); + else if (!strcasecmp(Name, "RcRepeatDelta")) RcRepeatDelta = 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); @@ -716,6 +720,8 @@ bool cSetup::Save(void) Store("SVDRPTimeout", SVDRPTimeout); Store("ZapTimeout", ZapTimeout); Store("ChannelEntryTimeout",ChannelEntryTimeout); + Store("RcRepeatDelay", RcRepeatDelay); + Store("RcRepeatDelta", RcRepeatDelta); Store("DefaultPriority", DefaultPriority); Store("DefaultLifetime", DefaultLifetime); Store("PauseKeyHandling", PauseKeyHandling); diff --git a/config.h b/config.h index 807850fb..00b2d68e 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 2.60 2012/12/30 13:08:41 kls Exp $ + * $Id: config.h 2.64 2013/02/05 11:19:20 kls Exp $ */ #ifndef __CONFIG_H @@ -22,13 +22,13 @@ // VDR's own version number: -#define VDRVERSION "1.7.36" -#define VDRVERSNUM 10736 // Version * 10000 + Major * 100 + Minor +#define VDRVERSION "1.7.37" +#define VDRVERSNUM 10737 // Version * 10000 + Major * 100 + Minor // The plugin API's version number: -#define APIVERSION "1.7.36" -#define APIVERSNUM 10736 // Version * 10000 + Major * 100 + Minor +#define APIVERSION "1.7.37" +#define APIVERSNUM 10737 // 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 @@ -49,7 +49,7 @@ #define MINOSDHEIGHT 324 #define MAXOSDHEIGHT 1200 -#define MaxFileName 256 +#define MaxFileName NAME_MAX // obsolete - use NAME_MAX directly instead! #define MaxSkinName 16 #define MaxThemeName 16 @@ -257,7 +257,7 @@ public: int MenuScrollWrap; int MenuKeyCloses; int MarkInstantRecord; - char NameInstantRecord[MaxFileName]; + char NameInstantRecord[NAME_MAX]; int InstantRecordTime; int LnbSLOF; int LnbFrequLo; @@ -280,6 +280,8 @@ public: int SVDRPTimeout; int ZapTimeout; int ChannelEntryTimeout; + int RcRepeatDelay; + int RcRepeatDelta; int DefaultPriority, DefaultLifetime; int PausePriority, PauseLifetime; int PauseKeyHandling; diff --git a/cutter.c b/cutter.c index 8a6efc54..edb28248 100644 --- a/cutter.c +++ b/cutter.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: cutter.c 2.22 2013/01/20 12:04:07 kls Exp $ + * $Id: cutter.c 2.23 2013/01/23 10:39:27 kls Exp $ */ #include "cutter.h" @@ -206,11 +206,8 @@ void cMpeg2Fixer::AdjGopTime(int Offset, int FramesPerSecond) void cMpeg2Fixer::AdjTref(int TrefOffset) { - Reset(); - if (!Find(0x00000100)) { - esyslog("ERROR: Picture header not found!"); + if (!FindHeader(0x00000100, "picture")) return; - } int Tref = GetByte() << 2; int Index1 = GetLastIndex(); uchar Byte2 = GetByte(); diff --git a/device.c b/device.c index 2678d688..af416411 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 2.70 2012/11/19 09:59:09 kls Exp $ + * $Id: device.c 2.71 2013/02/01 12:00:09 kls Exp $ */ #include "device.h" @@ -98,6 +98,7 @@ cDevice::cDevice(void) currentAudioTrack = ttNone; currentAudioTrackMissingCount = 0; currentSubtitleTrack = ttNone; + keepTracks = false; liveSubtitle = NULL; dvbSubtitleConverter = NULL; autoSelectPreferredSubtitleLanguage = true; @@ -923,6 +924,8 @@ void cDevice::SetVolume(int Volume, bool Absolute) void cDevice::ClrAvailableTracks(bool DescriptionsOnly, bool IdsOnly) { + if (keepTracks) + return; if (DescriptionsOnly) { for (int i = ttNone; i < ttMaxTrackTypes; i++) *availableTracks[i].description = 0; @@ -1044,6 +1047,8 @@ bool cDevice::SetCurrentSubtitleTrack(eTrackType Type, bool Manual) void cDevice::EnsureAudioTrack(bool Force) { + if (keepTracks) + return; if (Force || !availableTracks[currentAudioTrack].id) { eTrackType PreferredTrack = ttAudioFirst; int PreferredAudioChannel = 0; @@ -1075,6 +1080,8 @@ void cDevice::EnsureAudioTrack(bool Force) void cDevice::EnsureSubtitleTrack(void) { + if (keepTracks) + return; if (Setup.DisplaySubtitles) { eTrackType PreferredTrack = ttNone; int LanguagePreference = INT_MAX; // higher than the maximum possible value diff --git a/device.h b/device.h index 05b56e91..a6254517 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 2.43 2013/01/03 08:53:06 kls Exp $ + * $Id: device.h 2.45 2013/02/01 11:54:08 kls Exp $ */ #ifndef __DEVICE_H @@ -490,6 +490,7 @@ private: cMutex mutexCurrentSubtitleTrack; int currentAudioTrackMissingCount; bool autoSelectPreferredSubtitleLanguage; + bool keepTracks; int pre_1_3_19_PrivateStream; protected: virtual void SetAudioTrackDevice(eTrackType Type); @@ -539,6 +540,10 @@ public: void EnsureSubtitleTrack(void); ///< Makes sure one of the preferred language subtitle tracks is selected. ///< Only has an effect if Setup.DisplaySubtitles is on. + void SetKeepTracks(bool KeepTracks) { keepTracks = KeepTracks; } + ///< Controls whether the current audio and subtitle track settings shall + ///< be kept as they currently are, or if they shall be automatically + ///< adjusted. This is used when pausing live video. // Audio facilities @@ -752,7 +757,7 @@ public: ///< Returns -1 in case of error, otherwise the number of actually ///< processed bytes is returned. ///< PlayTs() shall process the TS packets either as a whole (returning - ///< n*TS_SIZE) or not at all, returning 0 or -1 and setting 'errno' accordingly). + ///< TS_SIZE) or not at all, returning 0 or -1 and setting 'errno' accordingly). bool Replaying(void) const; ///< Returns true if we are currently replaying. bool Transferring(void) const; diff --git a/dvbplayer.c b/dvbplayer.c index f2cb2d20..241c7ec8 100644 --- a/dvbplayer.c +++ b/dvbplayer.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: dvbplayer.c 2.28 2012/06/09 14:37:24 kls Exp $ + * $Id: dvbplayer.c 2.29 2013/01/27 14:03:16 kls Exp $ */ #include "dvbplayer.h" @@ -548,10 +548,11 @@ void cDvbPlayer::Action(void) } if (p) { int w; + bool VideoOnly = (dropFrame || playMode != pmPlay && !(playMode == pmSlow && playDir == pdForward)) && DeviceIsPlayingVideo(); if (isPesRecording) - w = PlayPes(p, pc, playMode != pmPlay && !(playMode == pmSlow && playDir == pdForward) && DeviceIsPlayingVideo()); + w = PlayPes(p, pc, VideoOnly); else - w = PlayTs(p, pc, playMode != pmPlay && !(playMode == pmSlow && playDir == pdForward) && DeviceIsPlayingVideo()); + w = PlayTs(p, pc, VideoOnly); if (w > 0) { p += w; pc -= w; diff --git a/lirc.c b/lirc.c index e3b68db9..42f07406 100644 --- a/lirc.c +++ b/lirc.c @@ -6,16 +6,13 @@ * * LIRC support added by Carsten Koch 2000-06-16. * - * $Id: lirc.c 2.1 2011/03/08 15:35:13 kls Exp $ + * $Id: lirc.c 2.4 2013/02/03 11:23:18 kls Exp $ */ #include "lirc.h" #include #include -#define REPEATDELAY 350 // ms -#define REPEATFREQ 100 // ms -#define REPEATTIMEOUT 500 // ms #define RECONNECTDELAY 3000 // ms cLircRemote::cLircRemote(const char *DeviceName) @@ -63,8 +60,10 @@ void cLircRemote::Action(void) { cTimeMs FirstTime; cTimeMs LastTime; + cTimeMs ThisTime; char buf[LIRC_BUFFER_SIZE]; char LastKeyName[LIRC_KEY_BUF] = ""; + bool pressed = false; bool repeat = false; int timeout = -1; @@ -94,34 +93,43 @@ void cLircRemote::Action(void) esyslog("ERROR: unparseable lirc command: %s", buf); continue; } + int Delta = ThisTime.Elapsed(); // the time between two subsequent LIRC events + ThisTime.Set(); if (count == 0) { - if (strcmp(KeyName, LastKeyName) == 0 && FirstTime.Elapsed() < REPEATDELAY) + if (strcmp(KeyName, LastKeyName) == 0 && FirstTime.Elapsed() < (uint)Setup.RcRepeatDelay) continue; // skip keys coming in too fast if (repeat) Put(LastKeyName, false, true); strcpy(LastKeyName, KeyName); + pressed = true; repeat = false; FirstTime.Set(); timeout = -1; } + else if (FirstTime.Elapsed() < (uint)Setup.RcRepeatDelay) + continue; // repeat function kicks in after a short delay + else if (LastTime.Elapsed() < (uint)Setup.RcRepeatDelta) + continue; // skip same keys coming in too fast else { - if (LastTime.Elapsed() < REPEATFREQ) - continue; // repeat function kicks in after a short delay (after last key instead of first key) - if (FirstTime.Elapsed() < REPEATDELAY) - continue; // skip keys coming in too fast (for count != 0 as well) repeat = true; - timeout = REPEATDELAY; + timeout = Delta * 10 / 9; } - LastTime.Set(); - Put(KeyName, repeat); + if (pressed) + LastTime.Set(); + Put(KeyName, repeat); } - else if (repeat) { // the last one was a repeat, so let's generate a release - if (LastTime.Elapsed() >= REPEATTIMEOUT) { - Put(LastKeyName, false, true); - repeat = false; - *LastKeyName = 0; - timeout = -1; - } + else if (pressed && repeat) { // the last one was a repeat, so let's generate a release + Put(LastKeyName, false, true); + pressed = false; + repeat = false; + *LastKeyName = 0; + timeout = -1; + } + else { + pressed = false; + repeat = false; + *LastKeyName = 0; + timeout = -1; } } } diff --git a/menu.c b/menu.c index d7faa872..ae389847 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 2.74 2013/01/17 14:20:08 kls Exp $ + * $Id: menu.c 2.76 2013/02/02 14:00:39 kls Exp $ */ #include "menu.h" @@ -3186,6 +3186,8 @@ cMenuSetupMisc::cMenuSetupMisc(void) Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$SVDRP timeout (s)"), &data.SVDRPTimeout)); Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$Zap timeout (s)"), &data.ZapTimeout)); Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$Channel entry timeout (ms)"), &data.ChannelEntryTimeout, 0)); + Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$Remote control repeat delay (ms)"), &data.RcRepeatDelay, 0)); + Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$Remote control repeat delta (ms)"), &data.RcRepeatDelta, 0)); Add(new cMenuEditChanItem(tr("Setup.Miscellaneous$Initial channel"), &data.InitialChannel, tr("Setup.Miscellaneous$as before"))); Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$Initial volume"), &data.InitialVolume, -1, 255, tr("Setup.Miscellaneous$as before"))); Add(new cMenuEditBoolItem(tr("Setup.Miscellaneous$Channels wrap"), &data.ChannelsWrap)); @@ -4485,6 +4487,7 @@ cString cReplayControl::fileName; cReplayControl::cReplayControl(bool PauseLive) :cDvbPlayerControl(fileName, PauseLive) { + cDevice::PrimaryDevice()->SetKeepTracks(PauseLive); currentReplayControl = this; displayReplay = NULL; marksModified = false; @@ -4504,6 +4507,7 @@ cReplayControl::cReplayControl(bool PauseLive) cReplayControl::~cReplayControl() { + cDevice::PrimaryDevice()->SetKeepTracks(false); Hide(); cStatus::MsgReplaying(this, NULL, fileName, false); Stop(); diff --git a/menu.cyVkmHd b/menu.cyVkmHd new file mode 100644 index 00000000..e69de29b diff --git a/osd.c b/osd.c index 75f13f4b..b9fdefd9 100644 --- a/osd.c +++ b/osd.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: osd.c 2.33 2012/12/15 11:16:41 kls Exp $ + * $Id: osd.c 2.35 2013/02/08 10:16:47 kls Exp $ */ #include "osd.h" @@ -853,12 +853,12 @@ cBitmap *cBitmap::Scaled(double FactorX, double FactorY, bool AntiAlias) b->SetBpp(8); b->Replace(*this); // copy palette (must be done *after* SetBpp()!) int SourceY = 0; - for (int y = 0; y < b->Height() - 1; y++) { + for (int y = 0; y < b->Height(); y++) { int SourceX = 0; - int sy = SourceY >> 16; + int sy = min(SourceY >> 16, Height() - 2); uint8_t BlendY = 0xFF - ((SourceY >> 8) & 0xFF); - for (int x = 0; x < b->Width() - 1; x++) { - int sx = SourceX >> 16; + for (int x = 0; x < b->Width(); x++) { + int sx = min(SourceX >> 16, Width() - 2); uint8_t BlendX = 0xFF - ((SourceX >> 8) & 0xFF); tColor c1 = b->Blend(GetColor(sx, sy), GetColor(sx + 1, sy), BlendX); tColor c2 = b->Blend(GetColor(sx, sy + 1), GetColor(sx + 1, sy + 1), BlendX); @@ -1631,7 +1631,6 @@ cOsd::cOsd(int Left, int Top, uint Level) savedBitmap = NULL; numBitmaps = 0; savedPixmap = NULL; - numPixmaps = 0; left = Left; top = Top; width = height = 0; @@ -1653,7 +1652,7 @@ cOsd::~cOsd() delete bitmaps[i]; delete savedBitmap; delete savedPixmap; - for (int i = 0; i < numPixmaps; i++) + for (int i = 0; i < pixmaps.Size(); i++) delete pixmaps[i]; for (int i = 0; i < Osds.Size(); i++) { if (Osds[i] == this) { @@ -1702,15 +1701,11 @@ void cOsd::DestroyPixmap(cPixmap *Pixmap) { if (isTrueColor) { LOCK_PIXMAPS; - for (int i = 1; i < numPixmaps; i++) { // begin at 1 - don't let the background pixmap be destroyed! + for (int i = 1; i < pixmaps.Size(); i++) { // begin at 1 - don't let the background pixmap be destroyed! if (pixmaps[i] == Pixmap) { pixmaps[0]->MarkViewPortDirty(Pixmap->ViewPort()); delete Pixmap; - while (i < numPixmaps - 1) { - pixmaps[i] = pixmaps[i + 1]; - i++; - } - numPixmaps--; + pixmaps[i] = NULL; return; } } @@ -1722,12 +1717,13 @@ cPixmap *cOsd::AddPixmap(cPixmap *Pixmap) { if (Pixmap) { LOCK_PIXMAPS; - if (numPixmaps < MAXOSDPIXMAPS) - return pixmaps[numPixmaps++] = Pixmap; - else - esyslog("ERROR: too many OSD pixmaps requested (maximum is %d)", MAXOSDPIXMAPS); + for (int i = 0; i < pixmaps.Size(); i++) { + if (!pixmaps[i]) + return pixmaps[i] = Pixmap; + } + pixmaps.Append(Pixmap); } - return NULL; + return Pixmap; } cPixmapMemory *cOsd::RenderPixmaps(void) @@ -1737,12 +1733,13 @@ cPixmapMemory *cOsd::RenderPixmaps(void) LOCK_PIXMAPS; // Collect overlapping dirty rectangles: cRect d; - for (int i = 0; i < numPixmaps; i++) { - cPixmap *pm = pixmaps[i]; - if (!pm->DirtyViewPort().IsEmpty()) { - if (d.IsEmpty() || d.Intersects(pm->DirtyViewPort())) { - d.Combine(pm->DirtyViewPort()); - pm->SetClean(); + for (int i = 0; i < pixmaps.Size(); i++) { + if (cPixmap *pm = pixmaps[i]) { + if (!pm->DirtyViewPort().IsEmpty()) { + if (d.IsEmpty() || d.Intersects(pm->DirtyViewPort())) { + d.Combine(pm->DirtyViewPort()); + pm->SetClean(); + } } } } @@ -1758,10 +1755,11 @@ cPixmapMemory *cOsd::RenderPixmaps(void) Pixmap->Clear(); // Render the individual pixmaps into the resulting pixmap: for (int Layer = 0; Layer < MAXPIXMAPLAYERS; Layer++) { - for (int i = 0; i < numPixmaps; i++) { - cPixmap *pm = pixmaps[i]; - if (pm->Layer() == Layer) + for (int i = 0; i < pixmaps.Size(); i++) { + if (cPixmap *pm = pixmaps[i]) { + if (pm->Layer() == Layer) Pixmap->DrawPixmap(pm, d); + } } } #ifdef DebugDirty diff --git a/osd.h b/osd.h index 0084caa6..7eb8db62 100644 --- a/osd.h +++ b/osd.h @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: osd.h 2.18 2012/12/03 13:49:02 kls Exp $ + * $Id: osd.h 2.19 2013/02/08 09:47:56 kls Exp $ */ #ifndef __OSD_H @@ -701,7 +701,6 @@ public: }; #define MAXOSDAREAS 16 -#define MAXOSDPIXMAPS 64 /// The cOsd class is the interface to the "On Screen Display". /// An actual output device needs to derive from this class and implement @@ -725,8 +724,7 @@ private: cBitmap *bitmaps[MAXOSDAREAS]; int numBitmaps; cPixmapMemory *savedPixmap; - cPixmap *pixmaps[MAXOSDPIXMAPS]; - int numPixmaps; + cVector pixmaps; int left, top, width, height; uint level; bool active; @@ -755,14 +753,10 @@ protected: virtual void SetActive(bool On) { active = On; } ///< Sets this OSD to be the active one. ///< A derived class must call cOsd::SetActive(On). - const cPixmap * const *Pixmaps(void) { return pixmaps; } - ///< Returns the list of currently active pixmaps in this OSD. - int NumPixmaps(void) { return numPixmaps; } - ///< Returns the number of currently active pixmaps in this OSD. cPixmap *AddPixmap(cPixmap *Pixmap); ///< Adds the given Pixmap to the list of currently active pixmaps in this OSD. - ///< Returns Pixmap if the operation was successful, or NULL if the maximum - ///< number of pixmaps has been exceeded. + ///< Returns Pixmap if the operation was successful, or NULL if for some reason + ///< the pixmap could not be added to the list. ///< A derived class that implements its own cPixmap class must call AddPixmap() ///< in order to add a newly created pixmap to the OSD's list of pixmaps. cPixmapMemory *RenderPixmaps(void); @@ -824,7 +818,8 @@ public: ///< The caller must not delete the returned object, it will be deleted when ///< the OSD is deleted. DestroyPixmap() can be called if a pixmap shall be ///< destroyed before the OSD is deleted. - ///< If this is not a true color OSD, this function returns NULL. + ///< If this is not a true color OSD, or if the pixmap could not be created + ///< due to limited resources, this function returns NULL. virtual void DestroyPixmap(cPixmap *Pixmap); ///< Destroys the given Pixmap, which has previously been created by a call to ///< CreatePixmap(). When the OSD is deleted, all pixmaps are destroyed diff --git a/po/ar.po b/po/ar.po index 946cc663..a44917d2 100644 --- a/po/ar.po +++ b/po/ar.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-07 14:59+0100\n" +"POT-Creation-Date: 2013-02-03 16:46+0100\n" "PO-Revision-Date: 2008-10-16 11:16-0400\n" "Last-Translator: Osama Alrawab \n" "Language-Team: Arabic \n" @@ -1154,6 +1154,12 @@ msgstr "" msgid "Setup.Miscellaneous$Channel entry timeout (ms)" msgstr "مدة انتهاء مدخلات القناة بالدقيقة" +msgid "Setup.Miscellaneous$Remote control repeat delay (ms)" +msgstr "" + +msgid "Setup.Miscellaneous$Remote control repeat delta (ms)" +msgstr "" + msgid "Setup.Miscellaneous$Initial channel" msgstr "القناة الاساسية" diff --git a/po/ca_ES.po b/po/ca_ES.po index 437542fd..f1a24fcd 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: \n" -"POT-Creation-Date: 2012-12-07 14:59+0100\n" +"POT-Creation-Date: 2013-02-03 16:46+0100\n" "PO-Revision-Date: 2008-03-02 19:02+0100\n" "Last-Translator: Luca Olivetti \n" "Language-Team: Catalan \n" @@ -1131,6 +1131,12 @@ msgstr "Temps d'espera Zap (s)" msgid "Setup.Miscellaneous$Channel entry timeout (ms)" msgstr "Temps d'introducció canal (ms)" +msgid "Setup.Miscellaneous$Remote control repeat delay (ms)" +msgstr "" + +msgid "Setup.Miscellaneous$Remote control repeat delta (ms)" +msgstr "" + msgid "Setup.Miscellaneous$Initial channel" msgstr "Canal inicial" diff --git a/po/cs_CZ.po b/po/cs_CZ.po index b0d5b7d1..a4f2515d 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: \n" -"POT-Creation-Date: 2012-12-07 14:59+0100\n" +"POT-Creation-Date: 2013-02-03 16:46+0100\n" "PO-Revision-Date: 2010-05-06 11:00+0200\n" "Last-Translator: Radek Ĺ ĹĽastnĂ˝ \n" "Language-Team: Czech \n" @@ -1130,6 +1130,12 @@ msgstr "ČasovĂ˝ limit Zap (s)" msgid "Setup.Miscellaneous$Channel entry timeout (ms)" msgstr "Prodleva při volbě kanĂĄlu (ms)" +msgid "Setup.Miscellaneous$Remote control repeat delay (ms)" +msgstr "" + +msgid "Setup.Miscellaneous$Remote control repeat delta (ms)" +msgstr "" + msgid "Setup.Miscellaneous$Initial channel" msgstr "KanĂĄl po spuĹĄtěnĂ­" diff --git a/po/da_DK.po b/po/da_DK.po index 6ca6c86a..511e03f6 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: \n" -"POT-Creation-Date: 2012-12-07 14:59+0100\n" +"POT-Creation-Date: 2013-02-03 16:46+0100\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n" "Last-Translator: Mogens Elneff \n" "Language-Team: Danish \n" @@ -1128,6 +1128,12 @@ msgstr "Zap timeout (s)" msgid "Setup.Miscellaneous$Channel entry timeout (ms)" msgstr "Kanal adgang timeout (ms)" +msgid "Setup.Miscellaneous$Remote control repeat delay (ms)" +msgstr "" + +msgid "Setup.Miscellaneous$Remote control repeat delta (ms)" +msgstr "" + msgid "Setup.Miscellaneous$Initial channel" msgstr "Kanal ved opstart" diff --git a/po/de_DE.po b/po/de_DE.po index 5476d9c7..77af04a7 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: \n" -"POT-Creation-Date: 2012-12-07 14:59+0100\n" +"POT-Creation-Date: 2013-02-03 16:46+0100\n" "PO-Revision-Date: 2010-01-16 16:46+0100\n" "Last-Translator: Klaus Schmidinger \n" "Language-Team: German \n" @@ -1128,6 +1128,12 @@ msgstr "Mindestzeit f msgid "Setup.Miscellaneous$Channel entry timeout (ms)" msgstr "Zeitlimit für Kanaleingabe (ms)" +msgid "Setup.Miscellaneous$Remote control repeat delay (ms)" +msgstr "Fernbedienung Wiederholverzögerung (ms)" + +msgid "Setup.Miscellaneous$Remote control repeat delta (ms)" +msgstr "Fernbedienung Wiederholintervall (ms)" + msgid "Setup.Miscellaneous$Initial channel" msgstr "Kanal beim Einschalten" diff --git a/po/el_GR.po b/po/el_GR.po index bf8933ec..d0c1c7df 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: \n" -"POT-Creation-Date: 2012-12-07 14:59+0100\n" +"POT-Creation-Date: 2013-02-03 16:46+0100\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n" "Last-Translator: Dimitrios Dimitrakos \n" "Language-Team: Greek \n" @@ -1128,6 +1128,12 @@ msgstr " msgid "Setup.Miscellaneous$Channel entry timeout (ms)" msgstr "" +msgid "Setup.Miscellaneous$Remote control repeat delay (ms)" +msgstr "" + +msgid "Setup.Miscellaneous$Remote control repeat delta (ms)" +msgstr "" + msgid "Setup.Miscellaneous$Initial channel" msgstr "" diff --git a/po/es_ES.po b/po/es_ES.po index 6a6f4e42..9e120e74 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: \n" -"POT-Creation-Date: 2012-12-07 14:59+0100\n" +"POT-Creation-Date: 2013-02-03 16:46+0100\n" "PO-Revision-Date: 2008-03-02 19:02+0100\n" "Last-Translator: Luca Olivetti \n" "Language-Team: Spanish \n" @@ -1129,6 +1129,12 @@ msgstr "Considerar canal como visto (sg)" msgid "Setup.Miscellaneous$Channel entry timeout (ms)" msgstr "Tiempo introducción canal (ms)" +msgid "Setup.Miscellaneous$Remote control repeat delay (ms)" +msgstr "" + +msgid "Setup.Miscellaneous$Remote control repeat delta (ms)" +msgstr "" + msgid "Setup.Miscellaneous$Initial channel" msgstr "Canal inicial" diff --git a/po/et_EE.po b/po/et_EE.po index 1d342366..7382a013 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: \n" -"POT-Creation-Date: 2012-12-07 14:59+0100\n" +"POT-Creation-Date: 2013-02-03 16:46+0100\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n" "Last-Translator: Arthur Konovalov \n" "Language-Team: Estonian \n" @@ -1128,6 +1128,12 @@ msgstr "Kanalivahetuse ooteaeg (s)" msgid "Setup.Miscellaneous$Channel entry timeout (ms)" msgstr "Kanali sisestamise ajalimiit (ms)" +msgid "Setup.Miscellaneous$Remote control repeat delay (ms)" +msgstr "" + +msgid "Setup.Miscellaneous$Remote control repeat delta (ms)" +msgstr "" + msgid "Setup.Miscellaneous$Initial channel" msgstr "Kanal käivitamisel" diff --git a/po/fi_FI.po b/po/fi_FI.po index 9a9fa747..164a376e 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: \n" -"POT-Creation-Date: 2012-12-07 14:59+0100\n" +"POT-Creation-Date: 2013-02-03 16:46+0100\n" "PO-Revision-Date: 2007-08-15 15:52+0200\n" "Last-Translator: Rolf Ahrenberg \n" "Language-Team: Finnish \n" @@ -1131,6 +1131,12 @@ msgstr "Kanavavalinnan odotusaika (s)" msgid "Setup.Miscellaneous$Channel entry timeout (ms)" msgstr "KanavasyĂśtteen odotusaika (ms)" +msgid "Setup.Miscellaneous$Remote control repeat delay (ms)" +msgstr "" + +msgid "Setup.Miscellaneous$Remote control repeat delta (ms)" +msgstr "" + msgid "Setup.Miscellaneous$Initial channel" msgstr "Kanava käynnistettäessä" diff --git a/po/fr_FR.po b/po/fr_FR.po index 55983d40..186b6e13 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: \n" -"POT-Creation-Date: 2012-12-07 14:59+0100\n" +"POT-Creation-Date: 2013-02-03 16:46+0100\n" "PO-Revision-Date: 2008-02-27 18:14+0100\n" "Last-Translator: Jean-Claude Repetto \n" "Language-Team: French \n" @@ -1134,6 +1134,12 @@ msgstr "Prise en compte cha msgid "Setup.Miscellaneous$Channel entry timeout (ms)" msgstr "Entrée chaîne timeout (ms)" +msgid "Setup.Miscellaneous$Remote control repeat delay (ms)" +msgstr "" + +msgid "Setup.Miscellaneous$Remote control repeat delta (ms)" +msgstr "" + msgid "Setup.Miscellaneous$Initial channel" msgstr "Chaîne initiale" diff --git a/po/hr_HR.po b/po/hr_HR.po index b7b2d4f4..af63cc12 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: \n" -"POT-Creation-Date: 2012-12-07 14:59+0100\n" +"POT-Creation-Date: 2013-02-03 16:46+0100\n" "PO-Revision-Date: 2008-03-17 19:00+0100\n" "Last-Translator: Adrian Caval \n" "Language-Team: Croatian \n" @@ -1130,6 +1130,12 @@ msgstr "Zap istje msgid "Setup.Miscellaneous$Channel entry timeout (ms)" msgstr "Upis kanala istječe (ms)" +msgid "Setup.Miscellaneous$Remote control repeat delay (ms)" +msgstr "" + +msgid "Setup.Miscellaneous$Remote control repeat delta (ms)" +msgstr "" + msgid "Setup.Miscellaneous$Initial channel" msgstr "Početni kanal" diff --git a/po/hu_HU.po b/po/hu_HU.po index 919d3b2d..a2cc9d0c 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: \n" -"POT-Creation-Date: 2012-12-07 14:59+0100\n" +"POT-Creation-Date: 2013-02-03 16:46+0100\n" "PO-Revision-Date: 2012-01-02 11:54+0200\n" "Last-Translator: István Füley \n" "Language-Team: Hungarian \n" @@ -1132,6 +1132,12 @@ msgstr "Ad msgid "Setup.Miscellaneous$Channel entry timeout (ms)" msgstr "Csatornaváltás timeout (ms)" +msgid "Setup.Miscellaneous$Remote control repeat delay (ms)" +msgstr "" + +msgid "Setup.Miscellaneous$Remote control repeat delta (ms)" +msgstr "" + msgid "Setup.Miscellaneous$Initial channel" msgstr "Csatorna induláskor" diff --git a/po/it_IT.po b/po/it_IT.po index 8df7150f..1425dc9c 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: \n" -"POT-Creation-Date: 2012-12-07 14:59+0100\n" +"POT-Creation-Date: 2013-02-03 16:46+0100\n" "PO-Revision-Date: 2012-12-22 19:00+0100\n" "Last-Translator: Diego Pierotto \n" "Language-Team: Italian \n" @@ -1135,6 +1135,12 @@ msgstr "Scadenza Zapping (s)" msgid "Setup.Miscellaneous$Channel entry timeout (ms)" msgstr "Scadenza voce canale (ms)" +msgid "Setup.Miscellaneous$Remote control repeat delay (ms)" +msgstr "" + +msgid "Setup.Miscellaneous$Remote control repeat delta (ms)" +msgstr "" + msgid "Setup.Miscellaneous$Initial channel" msgstr "Canale iniziale" diff --git a/po/lt_LT.po b/po/lt_LT.po index 931900ff..f1986eba 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: \n" -"POT-Creation-Date: 2012-12-07 14:59+0100\n" +"POT-Creation-Date: 2013-02-03 16:46+0100\n" "PO-Revision-Date: 2010-10-30 11:55+0200\n" "Last-Translator: Valdemaras Pipiras \n" "Language-Team: Lithuanian \n" @@ -1128,6 +1128,12 @@ msgstr "Kanalo perjungimo uĹžlaikymas (s)" msgid "Setup.Miscellaneous$Channel entry timeout (ms)" msgstr "UĹžlaikymas (ms) kanalo ÄŻvedimui" +msgid "Setup.Miscellaneous$Remote control repeat delay (ms)" +msgstr "" + +msgid "Setup.Miscellaneous$Remote control repeat delta (ms)" +msgstr "" + msgid "Setup.Miscellaneous$Initial channel" msgstr "Kanalas ÄŻjungimo metu" diff --git a/po/mk_MK.po b/po/mk_MK.po index b7570b66..b6c2d54f 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: \n" -"POT-Creation-Date: 2012-12-07 14:59+0100\n" +"POT-Creation-Date: 2013-02-03 16:46+0100\n" "PO-Revision-Date: 2012-11-19 15:18+0100\n" "Last-Translator: Dimitar Petrovski \n" "Language-Team: Macedonian \n" @@ -1129,6 +1129,12 @@ msgstr "Зап тајмаут (сок)" msgid "Setup.Miscellaneous$Channel entry timeout (ms)" msgstr "Тајмаут Са внос на канаН (ms)" +msgid "Setup.Miscellaneous$Remote control repeat delay (ms)" +msgstr "" + +msgid "Setup.Miscellaneous$Remote control repeat delta (ms)" +msgstr "" + msgid "Setup.Miscellaneous$Initial channel" msgstr "Почетен канаН" diff --git a/po/nl_NL.po b/po/nl_NL.po index a7dbadf1..ab16a2af 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: \n" -"POT-Creation-Date: 2012-12-07 14:59+0100\n" +"POT-Creation-Date: 2013-02-03 16:46+0100\n" "PO-Revision-Date: 2008-02-26 17:20+0100\n" "Last-Translator: Johan Schuring \n" "Language-Team: Dutch \n" @@ -1132,6 +1132,12 @@ msgstr "Zap timeout (s)" msgid "Setup.Miscellaneous$Channel entry timeout (ms)" msgstr "Tijdsduur kanaalinvoer (ms)" +msgid "Setup.Miscellaneous$Remote control repeat delay (ms)" +msgstr "" + +msgid "Setup.Miscellaneous$Remote control repeat delta (ms)" +msgstr "" + msgid "Setup.Miscellaneous$Initial channel" msgstr "Opstartkanaal" diff --git a/po/nn_NO.po b/po/nn_NO.po index aeeb0bb4..664018bb 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: \n" -"POT-Creation-Date: 2012-12-07 14:59+0100\n" +"POT-Creation-Date: 2013-02-03 16:46+0100\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n" "Last-Translator: Truls Slevigen \n" "Language-Team: Norwegian Nynorsk \n" @@ -1129,6 +1129,12 @@ msgstr "" msgid "Setup.Miscellaneous$Channel entry timeout (ms)" msgstr "" +msgid "Setup.Miscellaneous$Remote control repeat delay (ms)" +msgstr "" + +msgid "Setup.Miscellaneous$Remote control repeat delta (ms)" +msgstr "" + msgid "Setup.Miscellaneous$Initial channel" msgstr "" diff --git a/po/pl_PL.po b/po/pl_PL.po index c4e36d78..1580b0bb 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: \n" -"POT-Creation-Date: 2012-12-07 14:59+0100\n" +"POT-Creation-Date: 2013-02-03 16:46+0100\n" "PO-Revision-Date: 2008-03-09 12:59+0100\n" "Last-Translator: Michael Rakowski \n" "Language-Team: Polish \n" @@ -1129,6 +1129,12 @@ msgstr "Czas oczekiwania na zap (s)" msgid "Setup.Miscellaneous$Channel entry timeout (ms)" msgstr "Minął czas wejścia do kanału" +msgid "Setup.Miscellaneous$Remote control repeat delay (ms)" +msgstr "" + +msgid "Setup.Miscellaneous$Remote control repeat delta (ms)" +msgstr "" + msgid "Setup.Miscellaneous$Initial channel" msgstr "Początkowy kanał" diff --git a/po/pt_PT.po b/po/pt_PT.po index 44f10359..9dec2876 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: \n" -"POT-Creation-Date: 2012-12-07 14:59+0100\n" +"POT-Creation-Date: 2013-02-03 16:46+0100\n" "PO-Revision-Date: 2010-03-28 22:49+0100\n" "Last-Translator: Cris Silva \n" "Language-Team: Portuguese \n" @@ -1129,6 +1129,12 @@ msgstr "Tempo de espera entre mudan msgid "Setup.Miscellaneous$Channel entry timeout (ms)" msgstr "Tempo de espera ao mudar de canal (ms)" +msgid "Setup.Miscellaneous$Remote control repeat delay (ms)" +msgstr "" + +msgid "Setup.Miscellaneous$Remote control repeat delta (ms)" +msgstr "" + msgid "Setup.Miscellaneous$Initial channel" msgstr "Canal inicial" diff --git a/po/ro_RO.po b/po/ro_RO.po index ffdb44c8..4087af80 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: \n" -"POT-Creation-Date: 2012-12-07 14:59+0100\n" +"POT-Creation-Date: 2013-02-03 16:46+0100\n" "PO-Revision-Date: 2012-11-05 01:28+0100\n" "Last-Translator: Lucian Muresan \n" "Language-Team: Romanian \n" @@ -1131,6 +1131,12 @@ msgstr "Interval zapping (s)" msgid "Setup.Miscellaneous$Channel entry timeout (ms)" msgstr "Timeout la introducerea canalului (ms)" +msgid "Setup.Miscellaneous$Remote control repeat delay (ms)" +msgstr "" + +msgid "Setup.Miscellaneous$Remote control repeat delta (ms)" +msgstr "" + msgid "Setup.Miscellaneous$Initial channel" msgstr "Canalul de pornire" diff --git a/po/ru_RU.po b/po/ru_RU.po index 42bdcc92..9bcf571f 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: \n" -"POT-Creation-Date: 2012-12-07 14:59+0100\n" +"POT-Creation-Date: 2013-02-03 16:46+0100\n" "PO-Revision-Date: 2008-12-15 14:37+0100\n" "Last-Translator: Oleg Roitburd \n" "Language-Team: Russian \n" @@ -1129,6 +1129,12 @@ msgstr " msgid "Setup.Miscellaneous$Channel entry timeout (ms)" msgstr "żŕŐÔŐŰ ŇŕŐÜŐÝŘ ÔŰď ŇŇŢÔĐ ÚĐÝĐŰĐ (ms)" +msgid "Setup.Miscellaneous$Remote control repeat delay (ms)" +msgstr "" + +msgid "Setup.Miscellaneous$Remote control repeat delta (ms)" +msgstr "" + msgid "Setup.Miscellaneous$Initial channel" msgstr "şĐÝĐŰ ßŕŘ ŇÚŰîçŐÝŘŘ" diff --git a/po/sk_SK.po b/po/sk_SK.po index 118747a6..6aea45c2 100644 --- a/po/sk_SK.po +++ b/po/sk_SK.po @@ -1,14 +1,14 @@ # VDR language source file. # Copyright (C) 2008 Klaus Schmidinger # This file is distributed under the same license as the VDR package. -# Milan Hrala , 2011 +# Milan Hrala , 2011, 2013 # msgid "" msgstr "" "Project-Id-Version: VDR 1.7.16\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-07 14:59+0100\n" -"PO-Revision-Date: 2011-02-15 16:29+0100\n" +"POT-Creation-Date: 2013-02-03 16:46+0100\n" +"PO-Revision-Date: 2013-01-29 22:39+0100\n" "Last-Translator: Milan Hrala \n" "Language-Team: Slovak \n" "Language: sk\n" @@ -74,7 +74,7 @@ msgid "Rolloff" msgstr "Rolloff" msgid "PlpId" -msgstr "" +msgstr "PlpId" msgid "Starting EPG scan" msgstr "Začína prehľadávať EPG" @@ -329,50 +329,50 @@ msgstr "Slovensky" #. TRANSLATORS: The 3-letter code of the language msgid "LanguageCode$eng" -msgstr "slv" +msgstr "slk" msgid "Phase 1: Detecting RC code type" -msgstr "Fáza 1: Detekcia typu kódu" +msgstr "Fáza 1: Detekcia typu diaľkového ovládania" msgid "Press any key on the RC unit" -msgstr "Stlačte ľubovolnú klávesu ovládania" +msgstr "Stlačte ľubovolné tlačidlo ovládania" msgid "RC code detected!" -msgstr "Kód bol zistený!" +msgstr "Bol zosnímaný kód diaľkového ovládania!" msgid "Do not press any key..." msgstr "Nestláčajte žiadne klávesy..." msgid "Phase 2: Learning specific key codes" -msgstr "Fáza 2: Určenie konkrétneho kódu kláves" +msgstr "Fáza 2: Určenie funkcie tlačidiel" #, c-format msgid "Press key for '%s'" -msgstr "Stlačte klávesu pre '%s'" +msgstr "Stlačte tlačidlo pre funkciu '%s'" msgid "Press 'Up' to confirm" -msgstr "Pre potvrdenie stlačte klávesu 'Hore'" +msgstr "Pre potvrdenie stlačte tlačidlo 'Hore'" msgid "Press 'Down' to continue" -msgstr "Pokračujete stlačením klávesy 'Dole' " +msgstr "Pokračujete stlačením tlačidla 'Dole' " msgid "(press 'Up' to go back)" -msgstr "(Vrátite sa stlačením klávesy 'hore')" +msgstr "(Vrátite sa stlačením tlačidla 'hore')" msgid "(press 'Down' to end key definition)" -msgstr "(Definovanie tlačítok ukončíte stlačením klávesy 'dole')" +msgstr "(Definovanie tlačidiel ukončíte stlačením tlačidla 'dole')" msgid "(press 'Menu' to skip this key)" -msgstr "(stlačením 'Menu' preskočíte definíciu klávesy)" +msgstr "(stlačením 'Menu' preskočíte definíciu tlačidla)" msgid "Learning Remote Control Keys" -msgstr "Určenie kódu diaľkového ovládania" +msgstr "Programovanie diaľkového ovládania" msgid "Phase 3: Saving key codes" -msgstr "Fáza 3: Uloženie kódu" +msgstr "Fáza 3: Uloženie kódu tlačidiel" msgid "Press 'Up' to save, 'Down' to cancel" -msgstr "Stlačením 'hore' uložíte, 'Dole' zrušíte" +msgstr "Nastavenie stlačením tlačidla 'hore' uložíte, 'Dole' zrušíte" msgid "Key$Up" msgstr "Hore" @@ -411,13 +411,13 @@ msgid "Key$Info" msgstr "Info" msgid "Key$Play/Pause" -msgstr "" +msgstr "Prehrať/Pozastaviť" msgid "Key$Play" msgstr "Prehrať" msgid "Key$Pause" -msgstr "Prerušiť" +msgstr "Pozastaviť" msgid "Key$Stop" msgstr "Zastaviť" @@ -432,10 +432,10 @@ msgid "Key$FastRew" msgstr "Pretočiť späť" msgid "Key$Next" -msgstr "Ďalej" +msgstr "Nasledujúci" msgid "Key$Prev" -msgstr "Späť" +msgstr "Predchádzajúci" msgid "Key$Power" msgstr "Vypínač" @@ -465,7 +465,7 @@ msgid "Key$Subtitles" msgstr "Titulky" msgid "Key$Schedule" -msgstr "Program (EPG)" +msgstr "Televízny program" msgid "Key$Channels" msgstr "Kanály" @@ -519,7 +519,7 @@ msgid "encrypted" msgstr "kódovaný" msgid "Edit channel" -msgstr "Úpravy kanálu" +msgstr "Prispôsobiť kanál" msgid "Name" msgstr "Názov" @@ -564,13 +564,13 @@ msgid "Sid" msgstr "Sid" msgid "Channel settings are not unique!" -msgstr "Nastavenia kanálu nie sú obyčajné!" +msgstr "Nastavenia kanálu nie sú výnimočné!" msgid "Channels" msgstr "Kanály" msgid "Button$Edit" -msgstr "Úpravy" +msgstr "Upraviť" msgid "Button$New" msgstr "Nový" @@ -616,7 +616,7 @@ msgid "Edit timer" msgstr "Úprava plánu nahrávania" msgid "Active" -msgstr "V činnosti" +msgstr "Aktívny" msgid "Channel" msgstr "Kanál" @@ -625,10 +625,10 @@ msgid "Day" msgstr "Deň" msgid "Start" -msgstr "Začiatok" +msgstr "Začína" msgid "Stop" -msgstr "Koniec" +msgstr "Končí" msgid "VPS" msgstr "VPS" @@ -646,13 +646,13 @@ msgid "Button$Folder" msgstr "Zložka" msgid "Button$Single" -msgstr "" +msgstr "bez opakovania" msgid "Button$Repeating" -msgstr "" +msgstr "s opakovaním" msgid "First day" -msgstr "Prvý deň" +msgstr "Odo dňa" msgid "Select folder" msgstr "Vybrať zložku" @@ -685,13 +685,13 @@ msgid "Button$Switch" msgstr "Prepnúť" msgid "What's on now?" -msgstr "Čo ide?" +msgstr "Čo ide aktuálne?" msgid "What's on next?" msgstr "Čo nasleduje?" msgid "Button$Next" -msgstr "Ďalej" +msgstr "Nasleduje" msgid "Button$Now" msgstr "Teraz" @@ -730,7 +730,7 @@ msgid "Button$Play" msgstr "Prehrať" msgid "Button$Rewind" -msgstr "Na začiatok" +msgstr "Od začiatku" msgid "Recordings" msgstr "Nahrávky" @@ -745,7 +745,7 @@ msgid "Delete recording?" msgstr "Zmazať nahrávku?" msgid "Recording is being edited - really delete?" -msgstr "" +msgstr "Nahrávka sa upravuje - Naozaj zmazať?" msgid "Error while deleting recording!" msgstr "Pri vymazávaní nahrávky prišlo k chybe!" @@ -835,7 +835,7 @@ msgid "Setup.OSD$Scroll pages" msgstr "Rolovať strany" msgid "Setup.OSD$Scroll wraps" -msgstr "Z konca na začiatok" +msgstr "Rolovať cyklicky" msgid "Setup.OSD$Menu key closes" msgstr "Klávesa Menu zaviera" @@ -847,25 +847,25 @@ msgid "Setup.OSD$Folders in timer menu" msgstr "Zložky v menu plánovača" msgid "Setup.OSD$Number keys for characters" -msgstr "Číselné tlačidlá pre znaky" +msgstr "Písať znaky číselnými tlačidlami" msgid "Setup.OSD$Color key 0" -msgstr "" +msgstr "Farba klávesy 0" msgid "Setup.OSD$Color key 1" -msgstr "" +msgstr "Farba klávesy 1" msgid "Setup.OSD$Color key 2" -msgstr "" +msgstr "Farba klávesy 2" msgid "Setup.OSD$Color key 3" -msgstr "" +msgstr "Farba klávesy 3" msgid "EPG" msgstr "EPG" msgid "Button$Scan" -msgstr "Snímať" +msgstr "Skenovať" msgid "Setup.EPG$EPG scan timeout (h)" msgstr "Časový limit pre snímanie EPG (h)" @@ -880,7 +880,7 @@ msgid "Setup.EPG$Set system time" msgstr "Nastaviť systémový čas" msgid "Setup.EPG$Use time from transponder" -msgstr "Použiť čas z kanálu" +msgstr "Použiť čas z transpondéru" #. TRANSLATORS: note the plural! msgid "Setup.EPG$Preferred languages" @@ -930,7 +930,7 @@ msgid "Setup.DVB$Primary DVB interface" msgstr "Hlavné DVB rozhranie" msgid "Setup.DVB$Standard compliance" -msgstr "" +msgstr "Kompatibilná norma" msgid "Setup.DVB$Video format" msgstr "Formát videa" @@ -985,10 +985,10 @@ msgstr "Horn #, c-format msgid "Setup.LNB$Device %d connected to sat cable" -msgstr "" +msgstr "Zariadenie %d je pripojené na sat. kábel" msgid "Setup.LNB$own" -msgstr "" +msgstr "vlastný" msgid "CAM reset" msgstr "Resetnutie CAMu" @@ -1021,13 +1021,13 @@ msgid "Can't reset CAM!" msgstr "CAM modul nejde reštartovať!" msgid "do not pause live video" -msgstr "neprerušovať živé vysielanie" +msgstr "nepozastavovať živé vysielanie" msgid "confirm pause live video" -msgstr "potvrdiť prerušenie živého vysielania" +msgstr "potvrdiť pozastavenie živého vysielania" msgid "pause live video" -msgstr "prerušiť živé vysielanie" +msgstr "pozastaviť živé vysielanie" msgid "confirm" msgstr "overiť" @@ -1078,7 +1078,7 @@ msgid "Setup.Recording$Instant rec. time (min)" msgstr "Dĺžka okamžitého nahrávania (min)" msgid "Setup.Recording$present event" -msgstr "" +msgstr "súčasná udalosť" msgid "Setup.Recording$Max. video file size (MB)" msgstr "Maximálna veľkosť nahrávky (MB)" @@ -1099,34 +1099,40 @@ msgid "Setup.Replay$Show replay mode" msgstr "Zobraziť spôsob prehrávania" msgid "Setup.Replay$Show remaining time" -msgstr "" +msgstr "Zobraziť zostávajúci čas" msgid "Setup.Replay$Progress display time (s)" -msgstr "" +msgstr "Čas zobrazenia ukazovateľa priebehu (s)" msgid "Setup.Replay$Pause replay when setting mark" -msgstr "" +msgstr "Pozastaviť prehrávanie pri stanovení značky" msgid "Setup.Replay$Resume ID" -msgstr "ID obnovenie" +msgstr "ident. číslo obnovenia prehrávania" msgid "Miscellaneous" msgstr "Rôzne" msgid "Setup.Miscellaneous$Min. event timeout (min)" -msgstr "Min. pauza medzi udalosťami (min)" +msgstr "limit pred nahrávaním (min)" msgid "Setup.Miscellaneous$Min. user inactivity (min)" -msgstr "Časový limit nečinnosti (min)" +msgstr "vymedziť užívateľskú nečinnosť (min)" msgid "Setup.Miscellaneous$SVDRP timeout (s)" msgstr "Časový limit SVDRP (s)" msgid "Setup.Miscellaneous$Zap timeout (s)" -msgstr "Časový limit Zap (s)" +msgstr "pamätať predošlý kanál po ... (s)" msgid "Setup.Miscellaneous$Channel entry timeout (ms)" -msgstr "Čas pri voľbe kanála (ms)" +msgstr "limit pri voľbe kanála (ms)" + +msgid "Setup.Miscellaneous$Remote control repeat delay (ms)" +msgstr "" + +msgid "Setup.Miscellaneous$Remote control repeat delta (ms)" +msgstr "" msgid "Setup.Miscellaneous$Initial channel" msgstr "Kanál po spustení" @@ -1138,10 +1144,10 @@ msgid "Setup.Miscellaneous$Initial volume" msgstr "Hlasitosť po spustení" msgid "Setup.Miscellaneous$Channels wrap" -msgstr "Prepínať z prvého na posledný a opačne" +msgstr "Kanály cyklovať pri prepnutí" msgid "Setup.Miscellaneous$Show channel names with source" -msgstr "" +msgstr "Zobraziť kanály so zdrojom" msgid "Setup.Miscellaneous$Emergency exit" msgstr "Núdzové ukončenie" @@ -1192,22 +1198,22 @@ msgid "Cancel editing?" msgstr "Zrušiť úpravy?" msgid "No audio available!" -msgstr "Zvuk nie je dostupný!" +msgstr "Zvukové stopy nie sú dostupné!" msgid "No subtitles" msgstr "Bez titulkov" msgid "No subtitles available!" -msgstr "žiadne dostupné titulky!" +msgstr "Žiadne titulky nie sú dostupné!" msgid "Not enough disk space to start recording!" msgstr "Málo volného miesta na nahrávanie!" msgid "No free DVB device to record!" -msgstr "Žiadna DVB karta nie je volná pre nahrávanie" +msgstr "Pre nahrávanie nie je volné žiadne DVB zariadenie!" msgid "Pausing live video..." -msgstr "Prerušuje sa bežiaci program ..." +msgstr "Pozastavuje sa živé vysielanie ..." msgid "Delete timeshift recording?" msgstr "Vymazať timeshift záznamy?" @@ -1217,19 +1223,19 @@ msgid "Jump: " msgstr "Skok: " msgid "No editing marks defined!" -msgstr "Nie sú určené značky úprav!" +msgstr "Neboli vyznačené značky pre zostrihanie!" msgid "No editing sequences defined!" -msgstr "" +msgstr "Neboli určené sekvencie úprav!" msgid "Can't start editing process!" -msgstr "Nemôže začať spracovanie úprav!" +msgstr "Nemôže začať zostrihanie!" msgid "Editing process started" -msgstr "Spracovanie úprav začalo" +msgstr "Proces strihania sa spustil" msgid "Editing process already active!" -msgstr "Spracovanie úprav je v činnosti!" +msgstr "Proces zostrihania je aktívny!" msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&" msgstr " aáäbcčdďeéfghiíjklĺľmnňoóôpqrŕsštťuúvwxyýzž0123456789-.,#~\\^$[]|()*+?{}/:%@&" @@ -1256,22 +1262,22 @@ msgid "Channel locked (recording)!" msgstr "Kanál je zamknutý (nahráva sa)!" msgid "Low disk space!" -msgstr "Za chvíľku bude plný disk!" +msgstr "Nedostatok miesta na disku!" msgid "Regenerating index file" -msgstr "Regeneračný indexový súbor" +msgstr "Obnova indexového súboru" msgid "Index file regeneration complete" -msgstr "Regenerácia indexového súboru hotová" +msgstr "Obnova indexového súboru hotová" msgid "Index file regeneration failed!" -msgstr "" +msgstr "Obnova indexového súboru zlyhala!" msgid "Can't shutdown - option '-s' not given!" msgstr "Vypnutie nie je možné - chýba voľba '-s'!" msgid "Editing - shut down anyway?" -msgstr "Upravujem - aj tak vypnúť?" +msgstr "Zostriháva sa - aj tak vypnúť?" msgid "Recording - shut down anyway?" msgstr "Nahráva - aj tak vypnúť?" @@ -1281,11 +1287,11 @@ msgid "Recording in %ld minutes, shut down anyway?" msgstr "Nahrávanie začne za %ld minút - aj tak vypnúť?" msgid "shut down anyway?" -msgstr "Aj tak vypnúť?" +msgstr "Určite vypnúť?" #, c-format msgid "Plugin %s wakes up in %ld min, continue?" -msgstr "Modul %s štartuje za %ld min., pokračovať?" +msgstr "Modul %s sa prebudí za %ld min., pokračovať?" msgid "Editing - restart anyway?" msgstr "Upravuje sa - aj tak reštartovať?" @@ -1294,7 +1300,7 @@ msgid "Recording - restart anyway?" msgstr "Nahráva - aj tak reštartovať?" msgid "restart anyway?" -msgstr "Aj tak reštartovať?" +msgstr "Určite reštartovať?" #. TRANSLATORS: note the trailing blank! msgid "Volume " @@ -1304,22 +1310,22 @@ msgid "Classic VDR" msgstr "Klasické VDR" msgid "DISK" -msgstr "" +msgstr "DISK" msgid "LOAD" -msgstr "" +msgstr "ZAŤAŽENIE" msgid "TIMERS" -msgstr "" +msgstr "PLÁNY" msgid "DEVICES" -msgstr "" +msgstr "ZARIADENIA" msgid "LIVE" -msgstr "" +msgstr "NAŽIVO" msgid "PLAY" -msgstr "" +msgstr "PREHRÁVA SA" msgid "ST:TNG Panels" msgstr "ST:TNG panely" @@ -1363,7 +1369,7 @@ msgid "Recording started" msgstr "Začalo nahrávanie" msgid "VDR will shut down later - press Power to force" -msgstr "Vypnutie VDR bude odložené - platnosť potvrdte klávesou Power" +msgstr "VDR sa vypne neskoršie. - Vynútenie potvrdte klávesou Power" msgid "Press any key to cancel shutdown" msgstr "Ktorákoľvek klávesa zruší vypnutie" @@ -1372,10 +1378,10 @@ msgid "Switching primary DVB..." msgstr "Prepína hlavný DVB..." msgid "Editing process failed!" -msgstr "Spracovanie úprav zlyhalo!" +msgstr "Zostrihávanie zlyhalo!" msgid "Editing process finished" -msgstr "Spracovanie úprav skončilo" +msgstr "Proces zostrihávania dokončený" msgid "Press any key to cancel restart" msgstr "ktorákoľvek klávesa zruší reštart" @@ -1388,4 +1394,4 @@ msgid "Disk" msgstr "Disk" msgid "free" -msgstr "volne" +msgstr "voľné" diff --git a/po/sl_SI.po b/po/sl_SI.po index d3ef84c6..6c6abb55 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: \n" -"POT-Creation-Date: 2012-12-07 14:59+0100\n" +"POT-Creation-Date: 2013-02-03 16:46+0100\n" "PO-Revision-Date: 2008-02-28 19:44+0100\n" "Last-Translator: Matjaz Thaler \n" "Language-Team: Slovenian \n" @@ -1129,6 +1129,12 @@ msgstr " msgid "Setup.Miscellaneous$Channel entry timeout (ms)" msgstr "Timeout za vnos kanala (ms)" +msgid "Setup.Miscellaneous$Remote control repeat delay (ms)" +msgstr "" + +msgid "Setup.Miscellaneous$Remote control repeat delta (ms)" +msgstr "" + msgid "Setup.Miscellaneous$Initial channel" msgstr "Privzeti kanal" diff --git a/po/sr_SR.po b/po/sr_SR.po index 0a73f121..b7320444 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: \n" -"POT-Creation-Date: 2012-12-07 14:59+0100\n" +"POT-Creation-Date: 2013-02-03 16:46+0100\n" "PO-Revision-Date: 2011-01-09 15:57+0100\n" "Last-Translator: Milan Cvijanović \n" "Language-Team: Serbian \n" @@ -1151,6 +1151,12 @@ msgstr "Zap isti msgid "Setup.Miscellaneous$Channel entry timeout (ms)" msgstr "Upis kanala ističe (ms)" +msgid "Setup.Miscellaneous$Remote control repeat delay (ms)" +msgstr "" + +msgid "Setup.Miscellaneous$Remote control repeat delta (ms)" +msgstr "" + msgid "Setup.Miscellaneous$Initial channel" msgstr "Početni kanal" diff --git a/po/sv_SE.po b/po/sv_SE.po index 3c496468..b5df87de 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: \n" -"POT-Creation-Date: 2012-12-07 14:59+0100\n" +"POT-Creation-Date: 2013-02-03 16:46+0100\n" "PO-Revision-Date: 2008-03-12 18:25+0100\n" "Last-Translator: Magnus Andersson \n" "Language-Team: Swedish \n" @@ -1131,6 +1131,12 @@ msgstr "Zap timeout(s)" msgid "Setup.Miscellaneous$Channel entry timeout (ms)" msgstr "Timeout kanal (ms)" +msgid "Setup.Miscellaneous$Remote control repeat delay (ms)" +msgstr "" + +msgid "Setup.Miscellaneous$Remote control repeat delta (ms)" +msgstr "" + msgid "Setup.Miscellaneous$Initial channel" msgstr "Kanal vid uppstart" diff --git a/po/tr_TR.po b/po/tr_TR.po index 8b83d5fb..30e3fbd2 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: \n" -"POT-Creation-Date: 2012-12-07 14:59+0100\n" +"POT-Creation-Date: 2013-02-03 16:46+0100\n" "PO-Revision-Date: 2008-02-28 00:33+0100\n" "Last-Translator: Oktay Yolgeçen \n" "Language-Team: Turkish \n" @@ -1128,6 +1128,12 @@ msgstr "Zaping zaman a msgid "Setup.Miscellaneous$Channel entry timeout (ms)" msgstr "Kanal giriţ zaman aţýmý (ms)" +msgid "Setup.Miscellaneous$Remote control repeat delay (ms)" +msgstr "" + +msgid "Setup.Miscellaneous$Remote control repeat delta (ms)" +msgstr "" + msgid "Setup.Miscellaneous$Initial channel" msgstr "Açýlýţdaki kanal" diff --git a/po/uk_UA.po b/po/uk_UA.po index 21ef7901..4144c7aa 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: \n" -"POT-Creation-Date: 2012-12-07 14:59+0100\n" +"POT-Creation-Date: 2013-02-03 16:46+0100\n" "PO-Revision-Date: 2010-04-25 16:35+0200\n" "Last-Translator: Yarema aka Knedlyk \n" "Language-Team: Ukrainian \n" @@ -1128,6 +1128,12 @@ msgstr "Затримка переключання канаНу (сок)" msgid "Setup.Miscellaneous$Channel entry timeout (ms)" msgstr "Затримка часу для впровадження канаНу (ms)" +msgid "Setup.Miscellaneous$Remote control repeat delay (ms)" +msgstr "" + +msgid "Setup.Miscellaneous$Remote control repeat delta (ms)" +msgstr "" + msgid "Setup.Miscellaneous$Initial channel" msgstr "Канал при включенні" diff --git a/po/zh_CN.po b/po/zh_CN.po index a03396e1..3f4a6c6d 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: \n" -"POT-Creation-Date: 2012-12-07 14:59+0100\n" +"POT-Creation-Date: 2013-02-03 16:46+0100\n" "PO-Revision-Date: 2009-09-23 23:50+0800\n" "Last-Translator: Nan Feng \n" "Language-Team: Chinese (simplified) \n" @@ -1131,6 +1131,12 @@ msgstr "Zap 超时 (s)" msgid "Setup.Miscellaneous$Channel entry timeout (ms)" msgstr "频道进入超时 (ms)" +msgid "Setup.Miscellaneous$Remote control repeat delay (ms)" +msgstr "" + +msgid "Setup.Miscellaneous$Remote control repeat delta (ms)" +msgstr "" + msgid "Setup.Miscellaneous$Initial channel" msgstr "初始频道" diff --git a/recording.c b/recording.c index 9cd05223..57248a07 100644 --- a/recording.c +++ b/recording.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: recording.c 2.83 2013/01/16 14:17:44 kls Exp $ + * $Id: recording.c 2.86 2013/02/08 09:02:07 kls Exp $ */ #include "recording.h" @@ -64,11 +64,11 @@ #define MARKSUPDATEDELTA 10 // seconds between checks for updating editing marks #define MININDEXAGE 3600 // seconds before an index file is considered no longer to be written -#define MAX_SUBTITLE_LENGTH 40 - #define MAX_LINK_LEVEL 6 -bool VfatFileSystem = false; +int DirectoryPathMax = PATH_MAX; +int DirectoryNameMax = NAME_MAX; +bool DirectoryEncoding = false; int InstanceId = 0; cRecordings DeletedRecordings(true); @@ -540,22 +540,30 @@ tCharExchange CharExchange[] = { { 0, 0 } }; +const char *InvalidChars = "\"\\/:*?|<>#"; + +bool NeedsConversion(const char *p) +{ + return DirectoryEncoding && + (strchr(InvalidChars, *p) // characters that can't be part of a Windows file/directory name + || *p == '.' && (!*(p + 1) || *(p + 1) == FOLDERDELIMCHAR)); // Windows can't handle '.' at the end of file/directory names +} + char *ExchangeChars(char *s, bool ToFileSystem) { char *p = s; while (*p) { - if (VfatFileSystem) { - // The VFAT file system can't handle all characters, so we + if (DirectoryEncoding) { + // Some file systems can't handle all characters, so we // have to take extra efforts to encode/decode them: if (ToFileSystem) { - const char *InvalidChars = "\"\\/:*?|<>#"; switch (*p) { // characters that can be mapped to other characters: case ' ': *p = '_'; break; case FOLDERDELIMCHAR: *p = '/'; break; // characters that have to be encoded: default: - if (strchr(InvalidChars, *p) || *p == '.' && (!*(p + 1) || *(p + 1) == FOLDERDELIMCHAR)) { // Windows can't handle '.' at the end of file/directory names + if (NeedsConversion(p)) { int l = p - s; if (char *NewBuffer = (char *)realloc(s, strlen(s) + 10)) { s = NewBuffer; @@ -610,6 +618,107 @@ char *ExchangeChars(char *s, bool ToFileSystem) return s; } +char *LimitNameLengths(char *s, int PathMax, int NameMax) +{ + // Limits the total length of the directory path in 's' to PathMax, and each + // individual directory name to NameMax. The lengths of characters that need + // conversion when using 's' as a file name are taken into account accordingly. + // If a directory name exceeds NameMax, it will be truncated. If the whole + // directory path exceeds PathMax, individual directory names will be shortened + // (from right to left) until the limit is met, or until the currently handled + // directory name consists of only a single character. All operations are performed + // directly on the given 's', which may become shorter (but never longer) than + // the original value. + // Returns a pointer to 's'. + int Length = strlen(s); + int PathLength = 0; + // Collect the resulting lengths of each character: + bool NameTooLong = false; + int8_t a[Length]; + int n = 0; + int NameLength = 0; + for (char *p = s; *p; p++) { + if (*p == FOLDERDELIMCHAR) { + a[n] = -1; // FOLDERDELIMCHAR is a single character, neg. sign marks it + NameTooLong |= NameLength > NameMax; + NameLength = 0; + PathLength += 1; + } + else if (NeedsConversion(p)) { + a[n] = 3; // "#xx" + NameLength += 3; + PathLength += 3; + } + else { + int8_t l = Utf8CharLen(p); + a[n] = l; + NameLength += l; + PathLength += l; + while (l-- > 1) { + a[++n] = 0; + p++; + } + } + n++; + } + NameTooLong |= NameLength > NameMax; + // Limit names to NameMax: + if (NameTooLong) { + while (n > 0) { + // Calculate the length of the current name: + int NameLength = 0; + int i = n; + int b = i; + while (i-- > 0 && a[i] >= 0) { + NameLength += a[i]; + b = i; + } + // Shorten the name if necessary: + if (NameLength > NameMax) { + int l = 0; + i = n; + while (i-- > 0 && a[i] >= 0) { + l += a[i]; + if (NameLength - l <= NameMax) { + memmove(s + i, s + n, Length - n + 1); + memmove(a + i, a + n, Length - n + 1); + Length -= n - i; + PathLength -= l; + break; + } + } + } + // Switch to the next name: + n = b - 1; + } + } + // Limit path to PathMax: + n = Length; + while (PathLength > PathMax && n > 0) { + // Calculate how much to cut off the current name: + int i = n; + int b = i; + int l = 0; + while (--i > 0 && a[i - 1] >= 0) { + if (a[i] > 0) { + l += a[i]; + b = i; + if (PathLength - l <= PathMax) + break; + } + } + // Shorten the name if necessary: + if (l > 0) { + memmove(s + b, s + n, Length - n + 1); + Length -= n - b; + PathLength -= l; + } + // Switch to the next name: + n = i - 1; + } + return s; +} + cRecording::cRecording(cTimer *Timer, const cEvent *Event) { resume = RESUME_NOT_INITIALIZED; @@ -628,16 +737,10 @@ cRecording::cRecording(cTimer *Timer, const cEvent *Event) // set up the actual name: const char *Title = Event ? Event->Title() : NULL; const char *Subtitle = Event ? Event->ShortText() : NULL; - char SubtitleBuffer[MAX_SUBTITLE_LENGTH]; if (isempty(Title)) Title = Timer->Channel()->Name(); if (isempty(Subtitle)) Subtitle = " "; - else if (strlen(Subtitle) > MAX_SUBTITLE_LENGTH) { - // let's make sure the Subtitle doesn't produce too long a file name: - Utf8Strn0Cpy(SubtitleBuffer, Subtitle, MAX_SUBTITLE_LENGTH); - Subtitle = SubtitleBuffer; - } const char *macroTITLE = strstr(Timer->File(), TIMERMACRO_TITLE); const char *macroEPISODE = strstr(Timer->File(), TIMERMACRO_EPISODE); if (macroTITLE || macroEPISODE) { @@ -872,9 +975,12 @@ const char *cRecording::FileName(void) const const char *fmt = isPesRecording ? NAMEFORMATPES : NAMEFORMATTS; int ch = isPesRecording ? priority : channel; int ri = isPesRecording ? lifetime : instanceId; - name = ExchangeChars(name, true); - fileName = strdup(cString::sprintf(fmt, VideoDirectory, name, t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, t->tm_hour, t->tm_min, ch, ri)); - name = ExchangeChars(name, false); + char *Name = LimitNameLengths(strdup(name), DirectoryPathMax - strlen(VideoDirectory) - 1 - 42, DirectoryNameMax); // 42 = length of an actual recording directory name (generated with DATAFORMATTS) plus some reserve + if (strcmp(Name, name) != 0) + dsyslog("recording file name '%s' truncated to '%s'", name, Name); + Name = ExchangeChars(Name, true); + fileName = strdup(cString::sprintf(fmt, VideoDirectory, Name, t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, t->tm_hour, t->tm_min, ch, ri)); + free(Name); } return fileName; } @@ -1743,12 +1849,14 @@ cIndexFile::cIndexFile(const char *FileName, bool Record, bool IsPesRecording, b esyslog("ERROR: can't read from file '%s'", *fileName); free(index); index = NULL; + } + else if (isPesRecording) + ConvertFromPes(index, size); + if (!index || time(NULL) - buf.st_mtime >= MININDEXAGE) { close(f); f = -1; } - // we don't close f here, see CatchUp()! - else if (isPesRecording) - ConvertFromPes(index, size); + // otherwise we don't close f here, see CatchUp()! } else LOG_ERROR_STR(*fileName); @@ -1863,7 +1971,8 @@ bool cIndexFile::CatchUp(int Index) LOG_ERROR_STR(*fileName); if (Index < last) break; - cCondWait::SleepMs(INDEXCATCHUPWAIT); + cCondVar CondVar; + CondVar.TimedWait(mutex, INDEXCATCHUPWAIT); } } return index != NULL; diff --git a/recording.h b/recording.h index f555024c..037f2046 100644 --- a/recording.h +++ b/recording.h @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: recording.h 2.41 2012/12/23 15:11:53 kls Exp $ + * $Id: recording.h 2.42 2013/02/07 13:42:17 kls Exp $ */ #ifndef __RECORDING_H @@ -22,7 +22,9 @@ #define TIMERMACRO_TITLE "TITLE" #define TIMERMACRO_EPISODE "EPISODE" -extern bool VfatFileSystem; +extern int DirectoryPathMax; +extern int DirectoryNameMax; +extern bool DirectoryEncoding; extern int InstanceId; void RemoveDeletedRecordings(void); diff --git a/remote.c b/remote.c index 3f20d026..f3d90c96 100644 --- a/remote.c +++ b/remote.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: remote.c 2.6 2013/01/13 12:01:52 kls Exp $ + * $Id: remote.c 2.8 2013/02/03 15:44:55 kls Exp $ */ #include "remote.h" @@ -295,6 +295,14 @@ int cKbdRemote::MapCodeToFunc(uint64_t Code) return kfNone; } +void cKbdRemote::PutKey(uint64_t Code, bool Repeat, bool Release) +{ + if (rawMode || !Put(Code, Repeat, Release)) { + if (int func = MapCodeToFunc(Code)) + Put(KBDKEY(func), Repeat, Release); + } +} + int cKbdRemote::ReadKey(void) { cPoller Poller(STDIN_FILENO); @@ -356,24 +364,55 @@ uint64_t cKbdRemote::ReadKeySequence(void) void cKbdRemote::Action(void) { + cTimeMs FirstTime; + cTimeMs LastTime; + uint64_t FirstCommand = 0; uint64_t LastCommand = 0; + bool Delayed = false; bool Repeat = false; while (Running()) { uint64_t Command = ReadKeySequence(); - if (LastCommand && Command != LastCommand && Repeat) { - if (!rawMode) - Put(LastCommand, false, true); + if (Command) { + if (Command == LastCommand) { + // If two keyboard events with the same command come in without an intermediate + // timeout, this is a long key press that caused the repeat function to kick in: + Delayed = false; + FirstCommand = 0; + if (FirstTime.Elapsed() < (uint)Setup.RcRepeatDelay) + continue; // repeat function kicks in after a short delay + if (LastTime.Elapsed() < (uint)Setup.RcRepeatDelta) + continue; // skip same keys coming in too fast + PutKey(Command, true); + Repeat = true; + LastTime.Set(); + } + else if (Command == FirstCommand) { + // If the same command comes in twice with an intermediate timeout, we + // need to delay the second command to see whether it is going to be + // a repeat function or a separate key press: + Delayed = true; + } + else { + // This is a totally new key press, so we accept it immediately: + PutKey(Command); + Delayed = false; + FirstCommand = Command; + FirstTime.Set(); + } + } + else if (Repeat) { + // Timeout after a repeat function, so we generate a 'release': + PutKey(LastCommand, false, true); Repeat = false; } - if (Command) { - if (Command == LastCommand) - Repeat = true; - if (rawMode || !Put(Command, Repeat)) { - int func = MapCodeToFunc(Command); - if (func) - Put(KBDKEY(func)); - } + else if (Delayed && FirstCommand) { + // Timeout after two normal key presses of the same key, so accept the + // delayed key: + PutKey(FirstCommand); + Delayed = false; + FirstCommand = 0; + FirstTime.Set(); } LastCommand = Command; } diff --git a/remote.h b/remote.h index 4478f7fd..d453b2f4 100644 --- a/remote.h +++ b/remote.h @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: remote.h 2.0 2008/02/23 14:38:47 kls Exp $ + * $Id: remote.h 2.1 2013/02/03 14:34:56 kls Exp $ */ #ifndef __REMOTE_H @@ -111,6 +111,7 @@ private: int ReadKey(void); uint64_t ReadKeySequence(void); int MapCodeToFunc(uint64_t Code); + void PutKey(uint64_t Code, bool Repeat = false, bool Release = false); public: cKbdRemote(void); virtual ~cKbdRemote(); diff --git a/skinlcars.c b/skinlcars.c index b2dab50d..42565b7d 100644 --- a/skinlcars.c +++ b/skinlcars.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: skinlcars.c 2.15 2012/09/19 11:05:50 kls Exp $ + * $Id: skinlcars.c 2.18 2013/01/25 14:54:11 kls Exp $ */ // "Star Trek: The Next Generation"(R) is a registered trademark of Paramount Pictures, @@ -199,6 +199,8 @@ THEME_CLR(Theme, clrTrackItemCurrentBg, CLR_TRACK); // --- Helper functions ------------------------------------------------------ +static bool TwoColors = false; + static cOsd *CreateOsd(int Left, int Top, int x0, int y0, int x1, int y1) { cOsd *Osd = cOsdProvider::NewOsd(Left, Top); @@ -208,6 +210,7 @@ static cOsd *CreateOsd(int Left, int Top, int x0, int y0, int x1, int y1) Area.bpp = Bpp[i]; if (Osd->CanHandleAreas(&Area, 1) == oeOk) { Osd->SetAreas(&Area, 1); + TwoColors = Area.bpp == 1; break; } } @@ -272,16 +275,25 @@ static void DrawDeviceSignal(cOsd *Osd, const cDevice *Device, int x0, int y0, i int y01 = y00 + h; int y03 = y1 - d; int y02 = y03 - h; + tColor ColorSignalValue, ColorSignalRest; + if (TwoColors) { + ColorSignalValue = Theme.Color(clrBackground); + ColorSignalRest = Theme.Color(clrMenuFrameBg); + } + else { + ColorSignalValue = Theme.Color(clrSignalValue); + ColorSignalRest = Theme.Color(clrSignalRest); + } if (SignalStrength >= 0 && (Initial || SignalStrength != LastSignalStrength)) { int s = SignalStrength * w / 100; - Osd->DrawRectangle(x00, y00, x00 + s - 1, y01 - 1, Theme.Color(clrSignalValue)); - Osd->DrawRectangle(x00 + s, y00, x01 - 1, y01 - 1, Theme.Color(clrSignalRest)); + Osd->DrawRectangle(x00, y00, x00 + s - 1, y01 - 1, ColorSignalValue); + Osd->DrawRectangle(x00 + s, y00, x01 - 1, y01 - 1, ColorSignalRest); LastSignalStrength = SignalStrength; } if (SignalQuality >= 0 && (Initial || SignalQuality != LastSignalQuality)) { int q = SignalQuality * w / 100; - Osd->DrawRectangle(x00, y02, x00 + q - 1, y03 - 1, Theme.Color(clrSignalValue)); - Osd->DrawRectangle(x00 + q, y02, x01 - 1, y03 - 1, Theme.Color(clrSignalRest)); + Osd->DrawRectangle(x00, y02, x00 + q - 1, y03 - 1, ColorSignalValue); + Osd->DrawRectangle(x00 + q, y02, x01 - 1, y03 - 1, ColorSignalRest); LastSignalQuality = SignalQuality; } } @@ -445,7 +457,7 @@ void cSkinLCARSDisplayChannel::DrawTrack(void) void cSkinLCARSDisplayChannel::DrawSeen(int Current, int Total) { - int Seen = min(xc07 - xc06, int((xc07 - xc06) * double(Current) / Total)); + int Seen = (Total > 0) ? min(xc07 - xc06, int((xc07 - xc06) * double(Current) / Total)) : 0; if (initial || Seen != lastSeen) { int y0 = yc11 - ShowSeenExtent; int y1 = yc11 + lineHeight / 2 - Gap / 2; @@ -1331,6 +1343,7 @@ void cSkinLCARSDisplayMenu::DrawLive(const cChannel *Channel) osd->DrawText(xa00, yt00, itoa(Channel->Number()), Theme.Color(clrChannelFrameFg), Theme.Color(clrChannelFrameBg), tallFont, xa02 - xa00, yt02 - yt00, taTop | taRight | taBorder); osd->DrawText(xa03, yt00, Channel->Name(), Theme.Color(clrChannelName), Theme.Color(clrBackground), tallFont, xd00 - xa03, yd01 - yd00, taTop | taLeft); lastChannel = Channel; + DrawSeen(0, 0); } // The current programme: cSchedulesLock SchedulesLock; @@ -1411,7 +1424,7 @@ void cSkinLCARSDisplayMenu::DrawInfo(const cEvent *Event, bool WithTime) void cSkinLCARSDisplayMenu::DrawSeen(int Current, int Total) { - int Seen = min(xm08 - xm02, int((xm08 - xm02) * double(Current) / Total)); + int Seen = (Total > 0) ? min(xm08 - xm02, int((xm08 - xm02) * double(Current) / Total)) : 0; if (initial || Seen != lastSeen) { int y0 = yc04 - ShowSeenExtent; int y1 = yc04 + lineHeight / 2 - Gap / 2; @@ -1493,8 +1506,14 @@ void cSkinLCARSDisplayMenu::SetItem(const char *Text, int Index, bool Current, b int y = yi00 + Index * lineHeight; tColor ColorFg, ColorBg; if (Current) { - ColorFg = Theme.Color(clrMenuItemCurrentFg); - ColorBg = Theme.Color(clrMenuItemCurrentBg); + if (TwoColors) { + ColorFg = Theme.Color(clrBackground); + ColorBg = Theme.Color(clrMenuFrameBg); + } + else { + ColorFg = Theme.Color(clrMenuItemCurrentFg); + ColorBg = Theme.Color(clrMenuItemCurrentBg); + } osd->DrawRectangle(xi00, y, xi01 - 1, y + lineHeight - 1, ColorBg); osd->DrawRectangle(xi02, y, xi02 + lineHeight / 2 - 1, y + lineHeight - 1, ColorBg); osd->DrawEllipse (xi02 + lineHeight / 2, y, xi03 - 1, y + lineHeight - 1, ColorBg, 5); @@ -1662,6 +1681,7 @@ private: int lineHeight; tColor frameColor; int lastCurrentWidth; + int lastTotalWidth; cString lastDate; tTrackId lastTrackId; void DrawDate(void); @@ -1687,6 +1707,7 @@ cSkinLCARSDisplayReplay::cSkinLCARSDisplayReplay(bool ModeOnly) lineHeight = font->Height(); frameColor = Theme.Color(clrReplayFrameBg); lastCurrentWidth = 0; + lastTotalWidth = 0; int d = 5 * lineHeight; xp00 = 0; xp01 = xp00 + d / 2; @@ -1804,15 +1825,16 @@ void cSkinLCARSDisplayReplay::SetCurrent(const char *Current) { const cFont *font = cFont::GetFont(fontOsd); int w = font->Width(Current); - osd->DrawText(xp03, yp03 - lineHeight, Current, Theme.Color(clrReplayPosition), Theme.Color(clrBackground), font, lastCurrentWidth > w ? lastCurrentWidth : w, 0, taLeft); + osd->DrawText(xp03, yp03 - lineHeight, Current, Theme.Color(clrReplayPosition), Theme.Color(clrBackground), font, max(lastCurrentWidth, w), 0, taLeft); lastCurrentWidth = w; } void cSkinLCARSDisplayReplay::SetTotal(const char *Total) { const cFont *font = cFont::GetFont(fontOsd); - int w = font->Width(Total) + 10; - osd->DrawText(xp13 - w, yp03 - lineHeight, Total, Theme.Color(clrReplayPosition), Theme.Color(clrBackground), font, w, 0, taRight); + int w = font->Width(Total); + osd->DrawText(xp13 - w, yp03 - lineHeight, Total, Theme.Color(clrReplayPosition), Theme.Color(clrBackground), font, max(lastTotalWidth, w), 0, taRight); + lastTotalWidth = w; } void cSkinLCARSDisplayReplay::SetJump(const char *Jump) diff --git a/timers.c b/timers.c index ab8e4778..16cf8cef 100644 --- a/timers.c +++ b/timers.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: timers.c 2.15 2012/12/07 13:14:00 kls Exp $ + * $Id: timers.c 2.16 2013/02/05 11:13:20 kls Exp $ */ #include "timers.h" @@ -17,8 +17,6 @@ #include "remote.h" #include "status.h" -#define VFAT_MAX_FILENAME 40 // same as MAX_SUBTITLE_LENGTH in recording.c - // IMPORTANT NOTE: in the 'sscanf()' calls there is a blank after the '%d' // format characters in order to allow any number of blanks after a numeric // value! @@ -80,11 +78,6 @@ cTimer::cTimer(bool Instant, bool Pause, cChannel *Channel) lifetime = Pause ? Setup.PauseLifetime : Setup.DefaultLifetime; if (Instant && channel) snprintf(file, sizeof(file), "%s%s", Setup.MarkInstantRecord ? "@" : "", *Setup.NameInstantRecord ? Setup.NameInstantRecord : channel->Name()); - if (VfatFileSystem && (Utf8StrLen(file) > VFAT_MAX_FILENAME)) { - dsyslog("timer file name too long for VFAT file system: '%s'", file); - file[Utf8SymChars(file, VFAT_MAX_FILENAME)] = 0; - dsyslog("timer file name truncated to '%s'", file); - } } cTimer::cTimer(const cEvent *Event) @@ -120,11 +113,6 @@ cTimer::cTimer(const cEvent *Event) const char *Title = Event->Title(); if (!isempty(Title)) Utf8Strn0Cpy(file, Event->Title(), sizeof(file)); - if (VfatFileSystem && (Utf8StrLen(file) > VFAT_MAX_FILENAME)) { - dsyslog("timer file name too long for VFAT file system: '%s'", file); - file[Utf8SymChars(file, VFAT_MAX_FILENAME)] = 0; - dsyslog("timer file name truncated to '%s'", file); - } SetEvent(Event); } @@ -332,18 +320,6 @@ bool cTimer::Parse(const char *s) } //TODO add more plausibility checks result = ParseDay(daybuffer, day, weekdays); - if (VfatFileSystem) { - char *p = strrchr(filebuffer, FOLDERDELIMCHAR); - if (p) - p++; - else - p = filebuffer; - if (Utf8StrLen(p) > VFAT_MAX_FILENAME) { - dsyslog("timer file name too long for VFAT file system: '%s'", p); - p[Utf8SymChars(p, VFAT_MAX_FILENAME)] = 0; - dsyslog("timer file name truncated to '%s'", p); - } - } Utf8Strn0Cpy(file, filebuffer, sizeof(file)); strreplace(file, '|', ':'); if (isnumber(channelbuffer)) diff --git a/timers.h b/timers.h index cde8b3bd..adc55096 100644 --- a/timers.h +++ b/timers.h @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: timers.h 2.5 2012/12/07 13:13:40 kls Exp $ + * $Id: timers.h 2.6 2013/02/05 11:23:24 kls Exp $ */ #ifndef __TIMERS_H @@ -39,7 +39,7 @@ private: int stop; int priority; int lifetime; - mutable char file[MaxFileName]; + mutable char file[NAME_MAX * 2]; // *2 to be able to hold 'title' and 'episode', which can each be up to 255 characters long char *aux; const cEvent *event; public: diff --git a/vdr.1 b/vdr.1 index d22c4e91..63915ecb 100644 --- a/vdr.1 +++ b/vdr.1 @@ -8,7 +8,7 @@ .\" License as specified in the file COPYING that comes with the .\" vdr distribution. .\" -.\" $Id: vdr.1 2.9 2012/09/01 13:40:49 kls Exp $ +.\" $Id: vdr.1 2.11 2013/02/08 10:50:30 kls Exp $ .\" .TH vdr 1 "10 Feb 2008" "1.6" "Video Disk Recorder" .SH NAME @@ -43,7 +43,7 @@ which can be accessed on port 6419, for instance by \fBtelnet\fR. Send Dolby Digital audio to stdin of command \fIcmd\fR. .TP .BI \-\-cachedir= dir -save cache files in \fIdir\fR +Save cache files in \fIdir\fR (default is to save them in the video directory). .TP .BI \-c\ dir ,\ \-\-config= dir @@ -57,6 +57,15 @@ Run in daemon mode (implies \-\-no\-kbd). Use only the given DVB device (\fInum\fR = 0, 1, 2...). There may be several \fB\-D\fR options (by default all DVB devices will be used). .TP +.BI \-\-dirnames= path[,name[,enc]] +Set the maximum directory path length to \fIpath\fR (default is the maximum value +allowed on the system). If \fIname\fR is also given, it defines the maximum directory +name length (default is the maximum value allowed on the system). The optional +\fIenc\fR can be 0 or 1, and controls whether special characters in directory names +are encoded as hex values (default: 0). +The length of the video directory name and that of the actual recording directory is +subtracted from \fIpath\fR, to make sure the directory path will never become too long. +.TP .BI \-\-edit= rec Edit the given recording. \fIrec\fR must be the full path name of an existing recording. @@ -162,7 +171,7 @@ Call \fIcmd\fR before and after a recording. See the file \fIINSTALL\fR for more information. .TP .BI \-\-resdir= dir -read resource files from \fIdir\fR +Read resource files from \fIdir\fR (default is to read them from the config directory). .TP .BI \-s\ cmd ,\ \-\-shutdown= cmd @@ -185,11 +194,10 @@ vdr can switch to a lesser privileged user id during normal operation. .TP .BI \-\-userdump -allow coredumps if -u is given (only for debugging). +Allow coredumps if -u is given (only for debugging). .TP .BI \-\-vfat -Encode special characters in recording names to avoid problems -with VFAT file systems. +For backwards compatibility (same as \-\-dirnames= 250,40,1. .TP .BI \-v\ dir ,\ \-\-video= dir Use \fIdir\fR as video directory. diff --git a/vdr.c b/vdr.c index 88b8956f..8bb208b2 100644 --- a/vdr.c +++ b/vdr.c @@ -22,7 +22,7 @@ * * The project's page is at http://www.tvdr.de * - * $Id: vdr.c 2.45 2012/12/06 10:29:23 kls Exp $ + * $Id: vdr.c 2.48 2013/02/08 10:47:02 kls Exp $ */ #include @@ -227,6 +227,7 @@ int main(int argc, char *argv[]) { "config", required_argument, NULL, 'c' }, { "daemon", no_argument, NULL, 'd' }, { "device", required_argument, NULL, 'D' }, + { "dirnames", required_argument, NULL, 'd' | 0x100 }, { "edit", required_argument, NULL, 'e' | 0x100 }, { "epgfile", required_argument, NULL, 'E' }, { "filesize", required_argument, NULL, 'f' | 0x100 }, @@ -266,7 +267,8 @@ int main(int argc, char *argv[]) break; case 'c': ConfigDirectory = optarg; break; - case 'd': DaemonMode = true; break; + case 'd': DaemonMode = true; + break; case 'D': if (isnumber(optarg)) { int n = atoi(optarg); if (0 <= n && n < MAXDEVICES) { @@ -276,6 +278,43 @@ int main(int argc, char *argv[]) } fprintf(stderr, "vdr: invalid DVB device number: %s\n", optarg); return 2; + case 'd' | 0x100: { + char *s = optarg; + int n = strtol(s, &s, 10); + if (n <= 0 || n >= PATH_MAX) { + fprintf(stderr, "vdr: invalid directory path length: %s\n", optarg); + return 2; + } + DirectoryPathMax = n; + if (!*s) + break; + if (*s++ != ',') { + fprintf(stderr, "vdr: invalid delimiter: %s\n", optarg); + return 2; + } + n = strtol(s, &s, 10); + if (n <= 0 || n >= NAME_MAX) { + fprintf(stderr, "vdr: invalid directory name length: %s\n", optarg); + return 2; + } + DirectoryNameMax = n; + if (!*s) + break; + if (*s++ != ',') { + fprintf(stderr, "vdr: invalid delimiter: %s\n", optarg); + return 2; + } + n = strtol(s, &s, 10); + if (n != 0 && n != 1) { + fprintf(stderr, "vdr: invalid directory encoding: %s\n", optarg); + return 2; + } + DirectoryEncoding = n; + if (*s) { + fprintf(stderr, "vdr: unexpected data: %s\n", optarg); + return 2; + } + } break; case 'e' | 0x100: return CutRecording(optarg) ? 0 : 2; @@ -302,31 +341,30 @@ int main(int argc, char *argv[]) fprintf(stderr, "vdr: invalid instance id: %s\n", optarg); return 2; case 'l': { - char *p = strchr(optarg, '.'); - if (p) - *p = 0; - if (isnumber(optarg)) { - int l = atoi(optarg); - if (0 <= l && l <= 3) { - SysLogLevel = l; - if (!p) - break; - if (isnumber(p + 1)) { - int l = atoi(p + 1); - if (0 <= l && l <= 7) { - int targets[] = { LOG_LOCAL0, LOG_LOCAL1, LOG_LOCAL2, LOG_LOCAL3, LOG_LOCAL4, LOG_LOCAL5, LOG_LOCAL6, LOG_LOCAL7 }; - SysLogTarget = targets[l]; - break; - } - } - } - } + char *p = strchr(optarg, '.'); + if (p) + *p = 0; + if (isnumber(optarg)) { + int l = atoi(optarg); + if (0 <= l && l <= 3) { + SysLogLevel = l; + if (!p) + break; + if (isnumber(p + 1)) { + int l = atoi(p + 1); + if (0 <= l && l <= 7) { + int targets[] = { LOG_LOCAL0, LOG_LOCAL1, LOG_LOCAL2, LOG_LOCAL3, LOG_LOCAL4, LOG_LOCAL5, LOG_LOCAL6, LOG_LOCAL7 }; + SysLogTarget = targets[l]; + break; + } + } + } + } if (p) *p = '.'; fprintf(stderr, "vdr: invalid log level: %s\n", optarg); return 2; } - break; case 'L': if (access(optarg, R_OK | X_OK) == 0) PluginManager.SetDirectory(optarg); else { @@ -384,7 +422,9 @@ int main(int argc, char *argv[]) case 'V': DisplayVersion = true; break; case 'v' | 0x100: - VfatFileSystem = true; + DirectoryPathMax = 250; + DirectoryNameMax = 40; + DirectoryEncoding = true; break; case 'v': VideoDirectory = optarg; while (optarg && *optarg && optarg[strlen(optarg) - 1] == '/') @@ -399,7 +439,6 @@ int main(int argc, char *argv[]) } fprintf(stderr, "vdr: invalid watchdog timeout: %s\n", optarg); return 2; - break; default: return 2; } } @@ -435,6 +474,13 @@ int main(int argc, char *argv[]) " -D NUM, --device=NUM use only the given DVB device (NUM = 0, 1, 2...)\n" " there may be several -D options (default: all DVB\n" " devices will be used)\n" + " --dirnames=PATH[,NAME[,ENC]]\n" + " set the maximum directory path length to PATH\n" + " (default: %d); if NAME is also given, it defines\n" + " the maximum directory name length (default: %d);\n" + " the optional ENC can be 0 or 1, and controls whether\n" + " special characters in directory names are encoded as\n" + " hex values (default: 0)\n" " --edit=REC cut recording REC and exit\n" " -E FILE, --epgfile=FILE write the EPG data into the given FILE (default is\n" " '%s' in the video directory)\n" @@ -477,13 +523,15 @@ int main(int argc, char *argv[]) " --userdump allow coredumps if -u is given (debugging)\n" " -v DIR, --video=DIR use DIR as video directory (default: %s)\n" " -V, --version print version information and exit\n" - " --vfat encode special characters in recording names to\n" - " avoid problems with VFAT file systems\n" + " --vfat for backwards compatibility (same as\n" + " --dirnames=250,40,1\n" " -w SEC, --watchdog=SEC activate the watchdog timer with a timeout of SEC\n" " seconds (default: %d); '0' disables the watchdog\n" "\n", DEFAULTCACHEDIR, DEFAULTCONFDIR, + PATH_MAX, + NAME_MAX, DEFAULTEPGDATAFILENAME, MAXVIDEOFILESIZEDEFAULT, DEFAULTPLUGINDIR, @@ -924,7 +972,7 @@ int main(int argc, char *argv[]) Device->SetOccupied(TIMERDEVICETIMEOUT); } if (cDevice::PrimaryDevice()->HasDecoder() && HadProgramme && !cDevice::PrimaryDevice()->HasProgramme()) - Skins.Message(mtInfo, tr("Upcoming recording!")); // the previous SwitchChannel() has switched away the current live channel + Skins.QueueMessage(mtInfo, tr("Upcoming recording!")); // the previous SwitchChannel() has switched away the current live channel } } } @@ -1095,7 +1143,7 @@ int main(int argc, char *argv[]) if (Setup.PauseKeyHandling) { if (Setup.PauseKeyHandling > 1 || Interface->Confirm(tr("Pause live video?"))) { if (!cRecordControls::PauseLiveVideo()) - Skins.Message(mtError, tr("No free DVB device to record!")); + Skins.QueueMessage(mtError, tr("No free DVB device to record!")); } } key = kNone; // nobody else needs to see this key @@ -1105,7 +1153,7 @@ int main(int argc, char *argv[]) case kRecord: if (!cControl::Control()) { if (cRecordControls::Start()) - Skins.Message(mtInfo, tr("Recording started")); + Skins.QueueMessage(mtInfo, tr("Recording started")); key = kNone; // nobody else needs to see this key } break; @@ -1157,11 +1205,11 @@ int main(int argc, char *argv[]) switch (state) { case osPause: DELETE_MENU; if (!cRecordControls::PauseLiveVideo()) - Skins.Message(mtError, tr("No free DVB device to record!")); + Skins.QueueMessage(mtError, tr("No free DVB device to record!")); break; case osRecord: DELETE_MENU; if (cRecordControls::Start()) - Skins.Message(mtInfo, tr("Recording started")); + Skins.QueueMessage(mtInfo, tr("Recording started")); break; case osRecordings: DELETE_MENU; @@ -1179,7 +1227,7 @@ int main(int argc, char *argv[]) case osSwitchDvb: DELETE_MENU; cControl::Shutdown(); - Skins.Message(mtInfo, tr("Switching primary DVB...")); + Skins.QueueMessage(mtInfo, tr("Switching primary DVB...")); cDevice::SetPrimaryDevice(Setup.PrimaryDVB); break; case osPlugin: DELETE_MENU; @@ -1249,9 +1297,9 @@ int main(int argc, char *argv[]) EITScanner.Process(); if (!cCutter::Active() && cCutter::Ended()) { if (cCutter::Error()) - Skins.Message(mtError, tr("Editing process failed!")); + Skins.QueueMessage(mtError, tr("Editing process failed!")); else - Skins.Message(mtInfo, tr("Editing process finished")); + Skins.QueueMessage(mtInfo, tr("Editing process finished")); } }