mirror of
https://github.com/vdr-projects/vdr.git
synced 2025-03-01 10:50:46 +00:00
27919ee969
- Fixed setting the OSD size in the 'Confirm' interface call (thanks to
Deti Fliegl).
- Removed the 'read incomplete section...' error message in the EIT processor.
- Fixed channel data for "DW TV" (thanks to Axel Gruber).
- Added DPID to "PREMIERE MOVIE 1" in channels.conf.cable (thanks to Stephan
Schreiber).
- Prepared the OSD functions for multiple overlapping windows.
- Removed the check to see whether the system time is running linearly.
- Improved performance of SVDRP command entry.
- Removed EPGBugfixLevel '3' - after more than a year Pro-7 finally managed to
broadcast the correct timestamps for EPG events between 0:00 and 6:00!
- Fixed failing watchdog timer if program hangs in OSD activities (thanks to
Carsten Koch).
- No longer requiring 'libncurses' if compiling without DEBUG_OSD=1 and
REMOTE=KBD (thanks to Lauri Pesonen).
- The "Recordings" menu now displays a hierarchical structure if there are
subdirectories for the recordings. This can be controlled through the
"RecordingDirs" parameter in the "Setup" menu.
See "MANUAL/Replaying a Recording" for details.
- Improved speed of setting the Help button texts.
- Fixed handling file names that contain single quotes (') or dollar signs ($)
in the call to the shutdown command (option '-s') and the recording command
(option '-r').
- Improved error handling in the editing process; the resulting file will be
deleted if an error occured.
- A message is now prompted at the end of the editing process, indicating
whether the process succeeded or failed.
- Fixed setting the LastActivity timestamp after a shutdown prompt (thanks to
Sergei Haller).
- A message is now prompted if free disk space becomes low during recording.
- The editing process now calls AssertFreeDiskSpace() to remove deleted
recordings if the disk becomes full.
- The "Main" menu now displays in its title the used disk space (in percent)
and the estimated free disk space (in hh:mm), assuming a data rate of 30 MB
per minute.
- Activating the "Recordings" menu now displays "scanning recordings..." to
give the user some feedback in case this takes longer.
- Status messages are now displayed centered.
- Removed the 'Tools' subdirectory from the VDR archive. All contributed tools
can now be found at ftp://ftp.cadsoft.de/pub/people/kls/vdr/Tools.
112 lines
3.1 KiB
C++
112 lines
3.1 KiB
C++
/*
|
|
* osd.h: Abstract On Screen Display layer
|
|
*
|
|
* See the main source file 'vdr.c' for copyright information and
|
|
* how to reach the author.
|
|
*
|
|
* $Id: osd.h 1.25 2002/01/20 10:42:14 kls Exp $
|
|
*/
|
|
|
|
#ifndef __OSD_H
|
|
#define __OSD_H
|
|
|
|
#include "config.h"
|
|
#include "interface.h"
|
|
#include "tools.h"
|
|
|
|
#define MAXOSDITEMS (Setup.OSDheight - 4)
|
|
|
|
enum eOSState { osUnknown,
|
|
osMenu,
|
|
osContinue,
|
|
osSchedule,
|
|
osChannels,
|
|
osTimers,
|
|
osRecordings,
|
|
osSetup,
|
|
osCommands,
|
|
osRecord,
|
|
osReplay,
|
|
osDVD,
|
|
osStopRecord,
|
|
osStopReplay,
|
|
osCancelEdit,
|
|
osSwitchDvb,
|
|
osBack,
|
|
osEnd,
|
|
};
|
|
|
|
class cOsdItem : public cListObject {
|
|
private:
|
|
const char *text;
|
|
int offset;
|
|
eOSState state;
|
|
protected:
|
|
bool fresh;
|
|
bool userColor;
|
|
eDvbColor fgColor, bgColor;
|
|
public:
|
|
cOsdItem(eOSState State = osUnknown);
|
|
cOsdItem(const char *Text, eOSState State = osUnknown);
|
|
virtual ~cOsdItem();
|
|
bool HasUserColor(void) { return userColor; }
|
|
void SetText(const char *Text, bool Copy = true);
|
|
void SetColor(eDvbColor FgColor, eDvbColor BgColor = clrBackground);
|
|
const char *Text(void) { return text; }
|
|
virtual void Display(int Offset = -1, eDvbColor FgColor = clrWhite, eDvbColor BgColor = clrBackground);
|
|
virtual void Set(void) {}
|
|
virtual eOSState ProcessKey(eKeys Key);
|
|
};
|
|
|
|
class cOsdBase {
|
|
protected:
|
|
bool needsFastResponse;
|
|
public:
|
|
cOsdBase(bool FastResponse = false) { needsFastResponse = FastResponse; }
|
|
virtual ~cOsdBase() {}
|
|
int Width(void) { return Interface->Width(); }
|
|
int Height(void) { return Interface->Height(); }
|
|
bool NeedsFastResponse(void) { return needsFastResponse; }
|
|
virtual eOSState ProcessKey(eKeys Key) = 0;
|
|
};
|
|
|
|
class cOsdMenu : public cOsdBase, public cList<cOsdItem> {
|
|
private:
|
|
char *title;
|
|
int cols[cInterface::MaxCols];
|
|
int first, current, marked;
|
|
cOsdMenu *subMenu;
|
|
const char *helpRed, *helpGreen, *helpYellow, *helpBlue;
|
|
const char *status;
|
|
bool hasHotkeys;
|
|
protected:
|
|
bool visible;
|
|
virtual void Clear(void);
|
|
bool SpecialItem(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);
|
|
bool HasSubMenu(void) { return subMenu; }
|
|
void SetStatus(const char *s);
|
|
void SetTitle(const char *Title, bool ShowDate = true);
|
|
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();
|
|
void SetHasHotkeys(void) { hasHotkeys = true; }
|
|
int Current(void) { return current; }
|
|
void Add(cOsdItem *Item, bool Current = false);
|
|
void Display(void);
|
|
virtual eOSState ProcessKey(eKeys Key);
|
|
};
|
|
|
|
#endif //__OSD_H
|