frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

The macro DEPRECATED_VDR_CHARSET_OVERRIDE and the related code has been removed

Browse Source
This commit is contained in:
Klaus Schmidinger 2021-05-21 12:43:18 +02:00
parent ada85b693e
commit f7c8f582ea
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
HISTORY
View File

@ -9693,3 +9693,4 @@ Video Disk Recorder Revision History
- Added code for the 'qad' audio track (thanks to Helmut Binder). - Added code for the 'qad' audio track (thanks to Helmut Binder).
- The 'Edit path' dialog now also shows the total size of all recordings in that path - The 'Edit path' dialog now also shows the total size of all recordings in that path
(thanks to Christoph Haubrich). (thanks to Christoph Haubrich).
- The macro DEPRECATED_VDR_CHARSET_OVERRIDE and the related code has been removed.

13
vdr.c
View File

@ -22,7 +22,7 @@
* *
* The project's page is at http://www.tvdr.de * The project's page is at http://www.tvdr.de
* *
* $Id: vdr.c 5.5 2021/04/20 13:22:37 kls Exp $ * $Id: vdr.c 5.6 2021/05/21 12:43:18 kls Exp $
*/ */
#include <getopt.h> #include <getopt.h>
@ -237,13 +237,6 @@ int main(int argc, char *argv[])
int WatchdogTimeout = DEFAULTWATCHDOG; int WatchdogTimeout = DEFAULTWATCHDOG;
const char *Terminal = NULL; const char *Terminal = NULL;
const char *OverrideCharacterTable = NULL; const char *OverrideCharacterTable = NULL;
#ifndef DEPRECATED_VDR_CHARSET_OVERRIDE
#define DEPRECATED_VDR_CHARSET_OVERRIDE 0
#endif
#if DEPRECATED_VDR_CHARSET_OVERRIDE
OverrideCharacterTable = getenv("VDR_CHARSET_OVERRIDE");
const char *DeprecatedVdrCharsetOverride = OverrideCharacterTable;
#endif
bool UseKbd = true; bool UseKbd = true;
const char *LircDevice = NULL; const char *LircDevice = NULL;
@ -722,10 +715,6 @@ int main(int argc, char *argv[])
isyslog("codeset is '%s' - %s", CodeSet, known ? "known" : "unknown"); isyslog("codeset is '%s' - %s", CodeSet, known ? "known" : "unknown");
cCharSetConv::SetSystemCharacterTable(CodeSet); cCharSetConv::SetSystemCharacterTable(CodeSet);
} }
#if DEPRECATED_VDR_CHARSET_OVERRIDE
if (DeprecatedVdrCharsetOverride)
isyslog("use of environment variable VDR_CHARSET_OVERRIDE (%s) is deprecated!", DeprecatedVdrCharsetOverride);
#endif
if (OverrideCharacterTable) { if (OverrideCharacterTable) {
bool known = SI::SetOverrideCharacterTable(OverrideCharacterTable); bool known = SI::SetOverrideCharacterTable(OverrideCharacterTable);
isyslog("override character table is '%s' - %s", OverrideCharacterTable, known ? "known" : "unknown"); isyslog("override character table is '%s' - %s", OverrideCharacterTable, known ? "known" : "unknown");