mirror of
https://github.com/vdr-projects/vdr.git
synced 2025-03-01 10:50:46 +00:00
6f93a5f781
- Fixed detecting transponder lock in cDvbTuner (based on a patch from Stefan Meyknecht). - What was previously marked with WAIT_FOR_LOCK_AFTER_TUNING is now permanently active and uses a cCondVar to signal when a transponder is locked. - Added some missing 'const' to cChannel. - Added a sample setup for 'DisiCon-4 Single Cable Network' to 'diseqc.conf' (thanks to Oliver Endriss). - Fixed attaching a cPlayer to a cDevice, so that 'Operation not permitted' errors don't occur any more (thanks to Marco Schlüßler). - Fixed a case where the resultBuffer in cRemux ran full before getting a sync. - Removed the usleep() call from cDvbPlayer::Action() to make VDR run on NPTL systems (thanks to Alfred Zastrow). The NPTL check at startup has also been removed. - Taking the complete size of available data into account when deciding whether to clear the transfer buffer to avoid overflows (thanks to Reinhard Nissl). - Updated Romanian language texts and the iso8859-2 fonts (thanks to Lucian Muresan). - Now actually using the iso8859-15 fonts (thanks to Lucian Muresan). - Some minor code cleanups (thanks to Prakash K. Cheemplavam). - Fixed missing cleanup at program exit in case there is a problem with a plugin (thanks to Mattias Grönlund for pointing this out). - Increased the required free buffer space in the resultBuffer of cRemux to 2 * IPACKS to avoid a buffer overflow in case a cTS2PES writes one complete packet and then (within processing the same TS packet) wants to write another small packet. - Removed the signal handler and WakeUp() call from cThread (it is no longer needed). - Added some checks when canceling a thread and removed the usleep() in cThread::Start() (suggested by Ludwig Nussel). Also removed 'running' from cThread and using only childTid to indicate whether a thread is actually running. - Added cCondWait::Sleep() and using it to replace all usleep() calls (based on a suggestion by Werner Fink). - Only assigning events to timers if the related schedule has actually been modified. - When searching for the present event, the running status is now only taken into account if the event has been "seen" within the past 30 seconds. This avoids shortly seeing the wrong events in the channel display when switching to a channel that hasn't been tuned to in a while.
88 lines
2.4 KiB
C++
88 lines
2.4 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.9 2004/10/23 14:06:37 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_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);
|
|
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
|