mirror of
https://github.com/vdr-projects/vdr.git
synced 2025-03-01 10:50:46 +00:00
782b517c51
- The setup option "DVB/Video display format" is now only available if "Video format"
is set to "4:3" (suggested by Mikko Salo).
- Updated the Russian OSD texts (thanks to Vyacheslav Dikonov).
- Dropped CA support for the old '-icam' firmware.
- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
- Updated the Swedish OSD texts (thanks to Tomas Prybil).
- Fixed a few French OSD texts that were in the wrong place.
- Improved matching timers to EPG events, especially in case there are several events
with the same VPS time.
- Fixed cDolbyRepacker to allow recording ProSieben HD broadcasts (thanks to Reinhard
Nissl).
- Fixed cDvbDevice::SetVideoDisplayFormat() in case of 16:9 (thanks to Marco Schlüßler).
- The running status of a VPS event is now only taken seriously if that event has been
seen within the last 30 seconds - otherwise recording is done as if no VPS was
available.
- The day of a timer is now stored as a full date in ISO notation ("YYYY-MM-DD") in
'timers.conf' and for the result of the SVDRP command LSTT (based in parts on a
patch by Roman Krenický).
- Some fixes to avoid compiler warnings in gcc 4.0 (thanks to Ville Skyttä for reporting
these).
- Single shot timers are now reliably deleted when they have expired.
- Fixed setting the colored button help after deleting a recording in case the next
menu entry is a directory (thanks to Steffen Beyer).
- Improved falling back to normal recording if the VPS data hasn't been seen for more
than 30 seconds.
- Added a missing cMutexLock to cRemote::HasKeys() (thanks to Wolfgang Rohdewald).
- All log entries regarding timers now contain a short description of the timer.
90 lines
2.5 KiB
C++
90 lines
2.5 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 1.11 2005/03/19 15:51:19 kls Exp $
|
|
*/
|
|
|
|
#ifndef __FONT_H
|
|
#define __FONT_H
|
|
|
|
#include <stdlib.h>
|
|
|
|
enum eDvbFont {
|
|
fontOsd,
|
|
fontFix,
|
|
fontSml
|
|
#define eDvbFontSize (fontSml + 1)
|
|
};
|
|
|
|
enum eDvbCode {
|
|
code_iso8859_1,
|
|
code_iso8859_2,
|
|
code_iso8859_5,
|
|
code_iso8859_7,
|
|
code_iso8859_13,
|
|
code_iso8859_15,
|
|
#define eDvbCodeSize (code_iso8859_15 + 1)
|
|
};
|
|
|
|
class cFont {
|
|
public:
|
|
enum { NUMCHARS = 256 };
|
|
typedef unsigned long tPixelData;
|
|
struct tCharData {
|
|
tPixelData width, height;
|
|
tPixelData lines[1];
|
|
};
|
|
private:
|
|
static eDvbCode code;
|
|
static cFont *fonts[];
|
|
const tCharData *data[NUMCHARS];
|
|
int height;
|
|
public:
|
|
cFont(void *Data);
|
|
virtual ~cFont() {}
|
|
void SetData(void *Data);
|
|
virtual int Width(unsigned char c) const { return data[c]->width; }
|
|
///< Returns the width of the given character.
|
|
virtual int Width(const char *s) const;
|
|
///< Returns the width of the given string.
|
|
virtual int Height(unsigned char c) const { return data[c]->height; }
|
|
///< Returns the height of the given character.
|
|
virtual int Height(const char *s) const;
|
|
///< Returns the height of the given string.
|
|
virtual int Height(void) const { return height; }
|
|
///< Returns the height of this font (all characters have the same height).
|
|
const tCharData *CharData(unsigned char c) const { return data[c]; }
|
|
static bool SetCode(const char *Code);
|
|
static void SetCode(eDvbCode Code);
|
|
static void SetFont(eDvbFont Font, void *Data = NULL);
|
|
static const cFont *GetFont(eDvbFont Font);
|
|
};
|
|
|
|
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
|