mirror of
https://github.com/vdr-projects/vdr.git
synced 2025-03-01 10:50:46 +00:00
Version 1.5.1
- Added cDevice::HasCi() so that devices with Common Interface can be avoided when tuning to an FTA channel, thus preserving the CAM resources even on budget DVB cards (suggested by Petri Helin). - Fixed i18n characters for the Hungarian texts (thanks to Thomas Günther). - Now using cPipe instead of popen() in cCommand::Execute() to avoid problems with open file handles when starting background commands (thanks to Reinhard Nissl). - Removed 'assert(0)' from cDvbSpuDecoder::setTime() (thanks to Marco Schlüßler). - Fixed a possible crash when loading an invalid XPM file (thanks to Martin Wache). - Updated satellite names in 'sources.conf' (thanks to Thilo Wunderlich). - Adapted 'libsi' to DVB-S2 (thanks to Marco Schlüßler). - Fixed handling error status in cDvbTuner::GetFrontendStatus() (thanks to Reinhard Nissl). - Shutdown handling has been rewritten (thanks to Udo Richter). - Plugins can now implement the new function WakeupTime() to request VDR to wake up at a particular time (thanks to Udo Richter). - The HUP signal now forces a restart of VDR (thanks to Udo Richter). - cThread::EmergencyExit() has been replaced by ShutdownHandler.RequestEmergencyExit(). - Several references to "button" in a remote control context have been changed to "key" (based on a report from Marko Mäkelä regarding the "Menu button closes" text). The "MenuButtonCloses" parameter in 'setup.conf' has therefore been renamed to "MenuKeyCloses", accordingly. This will result in an "unknown config parameter: MenuButtonCloses" error message in the log file, so you may want to remove that entry from your 'setup.conf' file. - Simplified the error handling in cDvbTuner::GetFrontendStatus() (based on a discussion with Reinhard Nissl). - Updated the Finnish OSD texts (thanks to Rolf Ahrenberg). - Increased the maximum number of DVB devices to 8 (thanks to Rolf Ahrenberg). - The new Setup parameter "Channel entry timeout" can be used to customize the time since the last keypress until a numerically entered channel number is considered complete, and the channel is switched (suggested by Helmut Auer). Setting this parameter to 0 turns off the automatic channel switching, and the user will have to confirm the entry by pressing the "Ok" key.
This commit is contained in:
22
osd.c
22
osd.c
@@ -4,7 +4,7 @@
|
||||
* See the main source file 'vdr.c' for copyright information and
|
||||
* how to reach the author.
|
||||
*
|
||||
* $Id: osd.c 1.67 2006/02/26 14:31:31 kls Exp $
|
||||
* $Id: osd.c 1.68 2007/02/17 16:05:52 kls Exp $
|
||||
*/
|
||||
|
||||
#include "osd.h"
|
||||
@@ -218,14 +218,17 @@ bool cBitmap::LoadXpm(const char *FileName)
|
||||
int w, h, n, c;
|
||||
if (4 != sscanf(s, "%d %d %d %d", &w, &h, &n, &c)) {
|
||||
esyslog("ERROR: faulty 'values' line in XPM file '%s'", FileName);
|
||||
isXpm = false;
|
||||
break;
|
||||
}
|
||||
lines = h + n + 1;
|
||||
Xpm = MALLOC(char *, lines);
|
||||
memset(Xpm, 0, lines * sizeof(char*));
|
||||
}
|
||||
char *q = strchr(s, '"');
|
||||
if (!q) {
|
||||
esyslog("ERROR: missing quotes in XPM file '%s'", FileName);
|
||||
isXpm = false;
|
||||
break;
|
||||
}
|
||||
*q = 0;
|
||||
@@ -233,16 +236,21 @@ bool cBitmap::LoadXpm(const char *FileName)
|
||||
Xpm[index++] = strdup(s);
|
||||
else {
|
||||
esyslog("ERROR: too many lines in XPM file '%s'", FileName);
|
||||
isXpm = false;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (index == lines)
|
||||
Result = SetXpm(Xpm);
|
||||
else
|
||||
esyslog("ERROR: too few lines in XPM file '%s'", FileName);
|
||||
for (int i = 0; i < index; i++)
|
||||
free(Xpm[i]);
|
||||
if (isXpm) {
|
||||
if (index == lines)
|
||||
Result = SetXpm(Xpm);
|
||||
else
|
||||
esyslog("ERROR: too few lines in XPM file '%s'", FileName);
|
||||
}
|
||||
if (Xpm) {
|
||||
for (int i = 0; i < index; i++)
|
||||
free(Xpm[i]);
|
||||
}
|
||||
free(Xpm);
|
||||
fclose(f);
|
||||
}
|
||||
|
Reference in New Issue
Block a user