mirror of
https://github.com/vdr-projects/vdr.git
synced 2025-03-01 10:50:46 +00:00
9f91980146
- The CAM is now accessed only if the current channel actually has a non-zero Ca value, and CAM access is completely suppressed during replay, which avoids problems in case the CAM is attached to the primary DVB device. - The "Left" and "Right" buttons now set the cursor to the first or last list item even if the list consist only of a single page, like, for instance, the Main menu (thanks to Oliver Endriss). - Made the log message "OSD window width must be a multiple of 4..." a debug message instead of an error message, so it can be avoided by using a log level less than 3. - Updated Greek language texts (thanks to Dimitrios Dimitrakos). - Fixed faulty behaviour of the "Mute" key in case the channel display is visible (thanks to Florian Bartels for reporting this one and Sascha Volkenandt for helping to fix it). - Modified LOF handling to allow for C-band reception (thanks to Malcolm Caldwell). - Added some missing cAudio handling calls (thanks to Werner Fink). - Replaced the 'for' loops in StripAudioPackets() with memset() calls (thanks to Werner Fink). - Further increased the timeout until an index file is considerd no longer to be written. - Fixed a crash in case the index file can't be accessed any more during replay (thanks to Stefan Huelswitt for reporting this one). - Fixed displaying messages in the status line in case they exceed the OSD width (thanks to Gerhard Steiner for reporting this one). - Avoiding high CPU load in case the connection to LIRC gets lost (thanks to Ludwig Nussel). - Fixed handling repeat function with LIRC (thanks to Ludwig Nussel). - Fixed handling min/max borders when entering integer values (thanks to Andy Grobb for reporting this one). - Implemented a "resume ID" which allows several users to each have their own resume.vdr files (thanks to Martin Hammerschmid). This parameter can be set in the "Setup/Replay" menu (see MANUAL for details). - Now using 'libdtv' version 0.0.5 (thanks to Rolf Hakenes for the new version and Stefan Huelswitt for adapting VDR to it). - If no device with an MPEG decoder can be found at startup, the first device is now used as primary device (just to have some device). - Adjusted some Premiere channels in 'channels.conf' (thanks to Thomas Koch). - Updated 'channels.conf.cable' (thanks to Stefan Hußfeldt). - The 'epg.data' file is now read after all plugins have been started (thanks to Sascha Volkenandt). - The LIRC remote control no longer tries to learn keys if it can't connect to the LIRC daemon (thanks to Ludwig Nussel for reporting this one). The same applies to the RCU remote control in case of errors during startup. - Fixed handling of Ca parameters with values <= MAXDEVICES, which don't indicate an actual encrypted channel (thanks to Stefan Huelswitt for reporting this one).
115 lines
2.8 KiB
C
115 lines
2.8 KiB
C
/*
|
|
* dvbosd.c: Implementation of the DVB On Screen Display
|
|
*
|
|
* See the main source file 'vdr.c' for copyright information and
|
|
* how to reach the author.
|
|
*
|
|
* $Id: dvbosd.c 1.21 2003/04/12 12:10:12 kls Exp $
|
|
*/
|
|
|
|
#include "dvbosd.h"
|
|
#include <signal.h>
|
|
#include <sys/ioctl.h>
|
|
#include <sys/unistd.h>
|
|
#include "tools.h"
|
|
|
|
const cDvbDevice *cDvbOsd::dvbDevice = NULL;
|
|
|
|
cDvbOsd::cDvbOsd(int x, int y)
|
|
:cOsdBase(x, y)
|
|
{
|
|
osdDev = dvbDevice ? dvbDevice->OsdDeviceHandle() : -1;
|
|
if (dvbDevice && osdDev < 0)
|
|
esyslog("ERROR: illegal OSD device handle (%d)!", osdDev);
|
|
}
|
|
|
|
cDvbOsd::~cDvbOsd()
|
|
{
|
|
for (int i = 0; i < NumWindows(); i++)
|
|
CloseWindow(GetWindowNr(i));
|
|
}
|
|
|
|
void cDvbOsd::SetDvbDevice(const cDvbDevice *DvbDevice)
|
|
{
|
|
dvbDevice = DvbDevice;
|
|
}
|
|
|
|
bool cDvbOsd::SetWindow(cWindow *Window)
|
|
{
|
|
if (Window) {
|
|
// Window handles are counted 0...(MAXNUMWINDOWS - 1), but the actual window
|
|
// numbers in the driver are used from 1...MAXNUMWINDOWS.
|
|
int Handle = Window->Handle();
|
|
if (0 <= Handle && Handle < MAXNUMWINDOWS) {
|
|
Cmd(OSD_SetWindow, 0, Handle + 1);
|
|
return true;
|
|
}
|
|
esyslog("ERROR: illegal window handle: %d", Handle);
|
|
}
|
|
return false;
|
|
}
|
|
|
|
void cDvbOsd::Cmd(OSD_Command cmd, int color, int x0, int y0, int x1, int y1, const void *data)
|
|
{
|
|
if (osdDev >= 0) {
|
|
osd_cmd_t dc;
|
|
dc.cmd = cmd;
|
|
dc.color = color;
|
|
dc.x0 = x0;
|
|
dc.y0 = y0;
|
|
dc.x1 = x1;
|
|
dc.y1 = y1;
|
|
dc.data = (void *)data;
|
|
ioctl(osdDev, OSD_SEND_CMD, &dc);
|
|
}
|
|
}
|
|
|
|
bool cDvbOsd::OpenWindow(cWindow *Window)
|
|
{
|
|
if (SetWindow(Window)) {
|
|
Cmd(OSD_Open, Window->Bpp(), X0() + Window->X0(), Y0() + Window->Y0(), X0() + Window->X0() + Window->Width() - 1, Y0() + Window->Y0() + Window->Height() - 1, (void *)1); // initially hidden!
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
void cDvbOsd::CommitWindow(cWindow *Window)
|
|
{
|
|
if (SetWindow(Window)) {
|
|
int x1 = 0, y1 = 0, x2 = 0, y2 = 0;
|
|
if (Window->Dirty(x1, y1, x2, y2)) {
|
|
// commit colors:
|
|
int FirstColor = 0, LastColor = 0;
|
|
const eDvbColor *pal;
|
|
while ((pal = Window->NewColors(FirstColor, LastColor)) != NULL)
|
|
Cmd(OSD_SetPalette, FirstColor, LastColor, 0, 0, 0, pal);
|
|
// commit modified data:
|
|
Cmd(OSD_SetBlock, Window->Width(), x1, y1, x2, y2, Window->Data(x1, y1));
|
|
}
|
|
}
|
|
}
|
|
|
|
void cDvbOsd::ShowWindow(cWindow *Window)
|
|
{
|
|
if (SetWindow(Window))
|
|
Cmd(OSD_MoveWindow, 0, X0() + Window->X0(), Y0() + Window->Y0());
|
|
}
|
|
|
|
void cDvbOsd::HideWindow(cWindow *Window, bool Hide)
|
|
{
|
|
if (SetWindow(Window))
|
|
Cmd(Hide ? OSD_Hide : OSD_Show, 0);
|
|
}
|
|
|
|
void cDvbOsd::MoveWindow(cWindow *Window, int x, int y)
|
|
{
|
|
if (SetWindow(Window))
|
|
Cmd(OSD_MoveWindow, 0, X0() + x, Y0() + y);
|
|
}
|
|
|
|
void cDvbOsd::CloseWindow(cWindow *Window)
|
|
{
|
|
if (SetWindow(Window))
|
|
Cmd(OSD_Close);
|
|
}
|