From 14bd32b9486980a99ca552ec4eda6a11ab3a286a Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sat, 9 Feb 2013 15:35:00 +0100 Subject: Version 1.7.37 VDR developer version 1.7.37 is now available at MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.37.tar.bz2 A 'diff' against the previous version is available at ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.36-1.7.37.diff MD5 checksums: 602dc7e678bcfcf075da36344a337562 vdr-1.7.37.tar.bz2 34e953fcffc112f316cbfc1f53915324 vdr-1.7.36-1.7.37.diff WARNING: ======== This is a developer version. Even though I use it in my productive environment. I strongly recommend that you only use it under controlled conditions and for testing and debugging. Approaching version 2.0.0: ========================== If all goes well, there should be no more functional or API changes before the final version 2.0.0. There will just be a few more fixes. From the HISTORY file: - 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. --- osd.h | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'osd.h') diff --git a/osd.h b/osd.h index 0084caa..7eb8db6 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 -- cgit v1.2.3