mirror of
https://github.com/vdr-projects/vdr.git
synced 2025-03-01 10:50:46 +00:00
- Updated the Estonian OSD texts (thanks to Arthur Konovalov). - Updated the Finnish OSD texts (thanks to Rolf Ahrenberg). - Fixed handling 'summary.vdr' files with more than two empty lines (thanks to Christian Jacobsen for reporting this one). - Improved resetting CAM connections (thanks to Marco Schlüßler). - Implemented cVideoRepacker in remux.c to make sure every PES packet contains only data from one frame (thanks to Reinhard Nissl). NOTE: currently this doesn't work with MPEG1, so if you use MPEG1 you may want to change line 1158 in remux.c to ts2pes[numTracks++] = new cTS2PES(VPid, resultBuffer, IPACKS); as it was before. - EPG events without a title now display "No title" instead of "(null)" (thanks to Rolf Ahrenberg). - A device can now detach all receivers for a given PID, as is necessary, e.g., for the bitstreamout plugin (thanks to Werner Fink). - Added the year (two digits) to recording dates in LSTR, and thus also in menus (suggested by Jan Ekholm). - Fixed the call to Channels.Unlock() in cEITScanner::Process() (thanks to Reinhard Nissl). - Fixed handling timers with a day given as MTWTF--@6, i.e. a repeating timer with first day not as full date, but just day of month (thanks to Henrik Niehaus for reporting this one). - Removed an unnecessary #include from osd.c (thanks to Wolfgang Rohdewald). - Fixed dropping EPG events that have a zero start time or duration, in case it's an NVOD event (thanks to Chris Warren). - Fixed handling page up/down in menu lists in case there are several non selectable items in a row (thanks to Udo Richter for reporting this one). - Added cOsdMenu::SetCols() to allow adjusting the menu columns. - Modified cEITScanner::Process() so that it works on systems with only budget cards or a mix of DVB-S, DVB-C or DVB-T cards.
132 lines
3.7 KiB
C++
132 lines
3.7 KiB
C++
/*
|
|
* osdbase.h: Basic interface to the On Screen Display
|
|
*
|
|
* See the main source file 'vdr.c' for copyright information and
|
|
* how to reach the author.
|
|
*
|
|
* $Id: osdbase.h 1.11 2005/06/12 10:46:34 kls Exp $
|
|
*/
|
|
|
|
#ifndef __OSDBASE_H
|
|
#define __OSDBASE_H
|
|
|
|
#include "config.h"
|
|
#include "osd.h"
|
|
#include "skins.h"
|
|
#include "tools.h"
|
|
|
|
enum eOSState { osUnknown,
|
|
osContinue,
|
|
osSchedule,
|
|
osChannels,
|
|
osTimers,
|
|
osRecordings,
|
|
osPlugin,
|
|
osSetup,
|
|
osCommands,
|
|
osPause,
|
|
osRecord,
|
|
osReplay,
|
|
osStopRecord,
|
|
osStopReplay,
|
|
osCancelEdit,
|
|
osSwitchDvb,
|
|
osBack,
|
|
osEnd,
|
|
os_User, // the following values can be used locally
|
|
osUser1,
|
|
osUser2,
|
|
osUser3,
|
|
osUser4,
|
|
osUser5,
|
|
osUser6,
|
|
osUser7,
|
|
osUser8,
|
|
osUser9,
|
|
osUser10,
|
|
};
|
|
|
|
class cOsdItem : public cListObject {
|
|
private:
|
|
char *text;
|
|
int offset;
|
|
eOSState state;
|
|
bool selectable;
|
|
protected:
|
|
bool fresh;
|
|
public:
|
|
cOsdItem(eOSState State = osUnknown);
|
|
cOsdItem(const char *Text, eOSState State = osUnknown);
|
|
virtual ~cOsdItem();
|
|
bool Selectable(void) { return selectable; }
|
|
void SetText(const char *Text, bool Copy = true);
|
|
void SetSelectable(bool Selectable);
|
|
void SetFresh(bool Fresh);
|
|
const char *Text(void) { return text; }
|
|
virtual void Set(void) {}
|
|
virtual eOSState ProcessKey(eKeys Key);
|
|
};
|
|
|
|
class cOsdObject {
|
|
friend class cOsdMenu;
|
|
private:
|
|
bool isMenu;
|
|
protected:
|
|
bool needsFastResponse;
|
|
public:
|
|
cOsdObject(bool FastResponse = false) { isMenu = false; needsFastResponse = FastResponse; }
|
|
virtual ~cOsdObject() {}
|
|
bool NeedsFastResponse(void) { return needsFastResponse; }
|
|
bool IsMenu(void) { return isMenu; }
|
|
virtual void Show(void) {}
|
|
virtual eOSState ProcessKey(eKeys Key) { return osUnknown; }
|
|
};
|
|
|
|
class cOsdMenu : public cOsdObject, public cList<cOsdItem> {
|
|
private:
|
|
static cSkinDisplayMenu *displayMenu;
|
|
static int displayMenuCount;
|
|
static int displayMenuItems;
|
|
char *title;
|
|
int cols[cSkinDisplayMenu::MaxTabs];
|
|
int first, current, marked;
|
|
cOsdMenu *subMenu;
|
|
const char *helpRed, *helpGreen, *helpYellow, *helpBlue;
|
|
char *status;
|
|
int digit;
|
|
bool hasHotkeys;
|
|
protected:
|
|
cSkinDisplayMenu *DisplayMenu(void) { return displayMenu; }
|
|
const char *hk(const char *s);
|
|
void SetCols(int c0, int c1 = 0, int c2 = 0, int c3 = 0, int c4 = 0);
|
|
void SetHasHotkeys(void);
|
|
virtual void Clear(void);
|
|
bool SelectableItem(int idx);
|
|
void SetCurrent(cOsdItem *Item);
|
|
void RefreshCurrent(void);
|
|
void DisplayCurrent(bool Current);
|
|
void CursorUp(void);
|
|
void CursorDown(void);
|
|
void PageUp(void);
|
|
void PageDown(void);
|
|
void Mark(void);
|
|
eOSState HotKey(eKeys Key);
|
|
eOSState AddSubMenu(cOsdMenu *SubMenu);
|
|
eOSState CloseSubMenu();
|
|
bool HasSubMenu(void) { return subMenu; }
|
|
void SetStatus(const char *s);
|
|
void SetTitle(const char *Title);
|
|
void SetHelp(const char *Red, const char *Green = NULL, const char *Yellow = NULL, const char *Blue = NULL);
|
|
virtual void Del(int Index);
|
|
public:
|
|
cOsdMenu(const char *Title, int c0 = 0, int c1 = 0, int c2 = 0, int c3 = 0, int c4 = 0);
|
|
virtual ~cOsdMenu();
|
|
int Current(void) { return current; }
|
|
void Add(cOsdItem *Item, bool Current = false, cOsdItem *After = NULL);
|
|
void Ins(cOsdItem *Item, bool Current = false, cOsdItem *Before = NULL);
|
|
virtual void Display(void);
|
|
virtual eOSState ProcessKey(eKeys Key);
|
|
};
|
|
|
|
#endif //__OSDBASE_H
|