mirror of
https://github.com/vdr-projects/vdr.git
synced 2025-03-01 10:50:46 +00:00
Merry Christmas to all VDR users! It's been a very busy year for me, in which I was unable to spend as much time on VDR as I would have liked to. But now things are settled again and I managed to prepare a new developer version with the most important fixes and improvements. Please feel free to tell me if I missed something important - some things may well have slipped under my radar ;-). So here's my Christmas gift for you! VDR developer version 2.3.2 is now available at ftp://ftp.tvdr.de/vdr/Developer/vdr-2.3.2.tar.bz2 A 'diff' against the previous version is available at ftp://ftp.tvdr.de/vdr/Developer/vdr-2.3.1-2.3.2.diff MD5 checksums: 6dbb208ea3d59658a18912b49af175b3 vdr-2.3.2.tar.bz2 68a0ed9f01048026333939d30e0a6474 vdr-2.3.1-2.3.2.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. From the HISTORY file: - Fixed a crash when deleting a recording (reported by Oliver Endriss). - Fixed an overflow of PIDs in a receiver (thanks to Robert Hannebauer). - Updated the Italian OSD texts (thanks to Diego Pierotto). - Fixed initializing device specific parameters in cDvbTransponderParameters. - The function SetCurrentChannel(const cChannel *Channel) is now deprecated and may be removed in a future version. Use SetCurrentChannel(int ChannelNumber) instead. - The SVDRP command DELC now refuses to delete the very last channel in the list, to avoid ending up with an empty channel list. - The cRwLock class now allows nested read locks within a write lock from the same thread. This fixes possible crashes when moving or deleting channels in the menu or through SVDRP (as well as other operations that try to acquire a read lock within a write lock). - Fixed a crash when trying to delete a channel that is being used by a timer. - Fixed setting the current item and counter values in the Recordings menu after deleting the last recording in a subfolder. - Fixed a crash when deleting a recording that is currently being replayed. - Fixed a crash when moving a recording to a folder on a different volume. The cRecordingsHandler now performs its actual operations in a separate thread, thus avoiding locking problems and reducing the time between subsequent operations. - Added a note to the description of cFont::Size(), regarding possible differences between it and cFont::Height() (suggested to Thomas Reufer). - Made the cPlayer member functions FramesPerSecond, GetIndex and GetReplayMode 'const' (thanks to Thomas Reufer). - Fixed resuming replay at a given position, which was off by one frame (thanks to Thomas Reufer). - Improved handling frame numbers to have a smoother progress display during replay of recordings with B-frames (thanks to Thomas Reufer). - Fixed replaying recordings to their very end, if they don't end with an I-frame (thanks to Thomas Reufer). - Implemented a frame parser for H.265 (HEVC) recordings (thanks to Thomas Reufer). - Added cFont::Width(void) to get the default character width and allow stretched font drawing in high level OSDs (thanks to Thomas Reufer). - Fixed regenerating the index of audio recordings (thanks to Thomas Reufer). - Fixed building VDR with systemd >= 230 (thanks to Ville Skyttä). - Sorted sources.conf by continous azimuth (thanks to Lucian Muresan). - Added 'S58.5E Kazsat 3' to sources.conf (thanks to Aitugan Sarbassov). - Fixed truncated date/time strings in the skins on multi-byte UTF-8 systems (reported by Sergey Chernyavskiy). - Updated the Estonian OSD texts (thanks to Arthur Konovalov). - Added a 'const' version of cTimers::GetTimer() (thanks to Lars Hanisch). - Fixed a typo in the description of cTimers::GetTimersRead() (thanks to Lars Hanisch). - Fixed a possible buffer overflow in handling CA descriptors (suggested by Lars Hanisch). - Avoiding some duplicate code and unnecessary work in nit.c (thanks to Ville Skyttä). - Added support for the systemd watchdog (thanks to Marc Perrudin), - Added a short sleep to cTSBuffer::Action() to avoid high CPU usage (thanks to Sergey Chernyavskiy).
124 lines
5.6 KiB
C++
124 lines
5.6 KiB
C++
/*
|
|
* font.h: Font handling for the DVB On Screen Display
|
|
*
|
|
* See the main source file 'vdr.c' for copyright information and
|
|
* how to reach the author.
|
|
*
|
|
* $Id: font.h 4.2 2016/12/22 12:43:24 kls Exp $
|
|
*/
|
|
|
|
#ifndef __FONT_H
|
|
#define __FONT_H
|
|
|
|
#include <stdint.h>
|
|
#include <stdlib.h>
|
|
#include "tools.h"
|
|
|
|
#define MAXFONTNAME 64
|
|
#define MINFONTSIZE 10
|
|
#define MAXFONTSIZE 64
|
|
|
|
enum eDvbFont {
|
|
fontOsd,
|
|
fontFix,
|
|
fontSml
|
|
#define eDvbFontSize (fontSml + 1)
|
|
};
|
|
|
|
class cBitmap;
|
|
class cPixmap;
|
|
typedef uint32_t tColor; // see also osd.h
|
|
typedef uint8_t tIndex;
|
|
|
|
extern const char *DefaultFontOsd;
|
|
extern const char *DefaultFontSml;
|
|
extern const char *DefaultFontFix;
|
|
|
|
class cFont {
|
|
private:
|
|
static cFont *fonts[];
|
|
public:
|
|
virtual ~cFont() {}
|
|
virtual const char *FontName(void) const { return ""; }
|
|
///< Returns the font name.
|
|
virtual int Size(void) const { return Height(); }
|
|
///< Returns the original size as requested when the font was created.
|
|
///< This may be smaller than the actual height, for instance if the
|
|
///< font contains descenders.
|
|
virtual int Width(void) const = 0;
|
|
///< Returns the original character width as requested when the font was
|
|
///< created, or 0 if the default width is used.
|
|
virtual int Width(uint c) const = 0;
|
|
///< Returns the width of the given character in pixel.
|
|
virtual int Width(const char *s) const = 0;
|
|
///< Returns the width of the given string in pixel.
|
|
virtual int Height(void) const = 0;
|
|
///< Returns the height of this font in pixel (all characters have the same height).
|
|
int Height(const char *s) const { return Height(); }
|
|
///< Returns the height of this font in pixel (obsolete, just for backwards compatibility).
|
|
virtual void DrawText(cBitmap *Bitmap, int x, int y, const char *s, tColor ColorFg, tColor ColorBg, int Width) const = 0;
|
|
///< Draws the given text into the Bitmap at position (x, y) with the given colors.
|
|
///< The text will not exceed the given Width (if > 0), and will end with a complete character.
|
|
virtual void DrawText(cPixmap *Pixmap, int x, int y, const char *s, tColor ColorFg, tColor ColorBg, int Width) const {}; // not "pure", so that existing implementations still compile
|
|
///< Draws the given text into the Pixmap at position (x, y) with the given colors.
|
|
///< The text will not exceed the given Width (if > 0), and will end with a complete character.
|
|
static void SetFont(eDvbFont Font, const char *Name, int CharHeight);
|
|
///< Sets the given Font to use the font data according to Name (see CreateFont())
|
|
///< and make its characters CharHeight pixels high.
|
|
static const cFont *GetFont(eDvbFont Font);
|
|
///< Gets the given Font, which was previously set by a call to SetFont().
|
|
///< If no SetFont() call has been made, the font as defined in the setup is returned.
|
|
///< GetFont() is not thread-safe, and shall only be called from the main
|
|
///< thread! A font returned by GetFont() must only be used locally inside the
|
|
///< function it was retrieved from, and no long term pointer to it shall be kept,
|
|
///< because the cFont object may become invalid at any time after the
|
|
///< function that called GetFont() has returned.
|
|
static cFont *CreateFont(const char *Name, int CharHeight, int CharWidth = 0);
|
|
///< Creates a new font object with the given Name and makes its characters
|
|
///< CharHeight pixels high. If CharWidth is given, it overwrites the font's
|
|
///< default width. Name is of the form "Family:Style", for instance
|
|
///< "Verdana:Bold Italic" or "Times New Roman". See GetAvailableFontNames()
|
|
///< for how to get a list of all available font names.
|
|
///< If the requested font can't be created, a dummy font is returned.
|
|
///< The caller must delete the font when it is no longer needed.
|
|
static bool GetAvailableFontNames(cStringList *FontNames, bool Monospaced = false);
|
|
///< Queries the font configuration for a list of available font names,
|
|
///< which is returned in FontNames. If Monospaced is true, only
|
|
///< monospaced fonts will be returned. The resulting font names are
|
|
///< in a format that can be used with GetFontFileName() to get the name
|
|
///< of the actual font file.
|
|
///< Returns true if any font names were found.
|
|
static cString GetFontFileName(const char *FontName);
|
|
///< Returns the actual font file name for the given FontName.
|
|
#ifdef BIDI
|
|
static cString Bidi(const char *Ltr);
|
|
///< Converts any "right-to-left" parts in the "left-to-right" string Ltr
|
|
///< to the proper language specific representation and returns the resulting string.
|
|
#endif
|
|
};
|
|
|
|
class cTextWrapper {
|
|
private:
|
|
char *text;
|
|
char *eol;
|
|
int lines;
|
|
int lastLine;
|
|
public:
|
|
cTextWrapper(void);
|
|
cTextWrapper(const char *Text, const cFont *Font, int Width);
|
|
~cTextWrapper();
|
|
void Set(const char *Text, const cFont *Font, int Width);
|
|
///< Wraps the Text to make it fit into the area defined by the given Width
|
|
///< when displayed with the given Font.
|
|
///< Wrapping is done by inserting the necessary number of newline
|
|
///< characters into the string.
|
|
const char *Text(void);
|
|
///< Returns the full wrapped text.
|
|
int Lines(void) { return lines; }
|
|
///< Returns the actual number of lines needed to display the full wrapped text.
|
|
const char *GetLine(int Line);
|
|
///< Returns the given Line. The first line is numbered 0.
|
|
};
|
|
|
|
#endif //__FONT_H
|