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

Fixed a crash when replaying with DEBUG_OSD=1

Browse Source
This commit is contained in:
Klaus Schmidinger 2002-02-16 12:55:33 +01:00
parent 4c018b1c36
commit 3ecbdd489e
4 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -110,6 +110,7 @@ Stefan Huelswitt <huels@iname.com>
for implementing "Multi Speed Mode" for implementing "Multi Speed Mode"
for implementing backtracing for fast forward/rewind for implementing backtracing for fast forward/rewind
for implementing the replay mode display for implementing the replay mode display
for fixing a crash when replaying with DEBUG_OSD=1
Ulrich Röder <roeder@efr-net.de> Ulrich Röder <roeder@efr-net.de>
for pointing out that there are channels that have a symbol rate higher than for pointing out that there are channels that have a symbol rate higher than

3
HISTORY
View File

@ -997,10 +997,11 @@ Video Disk Recorder Revision History
- If a recording has no episode title, the trailing '~' is no longer shown in - If a recording has no episode title, the trailing '~' is no longer shown in
the progress display. the progress display.
2002-02-15: Version 1.0.0pre1 2002-02-16: Version 1.0.0pre1
- Added scanning for EPG data for another 4 days on channels that support this - Added scanning for EPG data for another 4 days on channels that support this
(thanks to Oleg Assovski). (thanks to Oleg Assovski).
- Removed '#define VFAT 1' from recording.c (was a leftover from testing). - Removed '#define VFAT 1' from recording.c (was a leftover from testing).
- Fixed the "Low disk space!" message (thanks to Sergei Haller). - Fixed the "Low disk space!" message (thanks to Sergei Haller).
- Added the TPID to Hessen-3 in 'channels.conf' (thanks to Sergei Haller). - Added the TPID to Hessen-3 in 'channels.conf' (thanks to Sergei Haller).
- Fixed a crash when replaying with DEBUG_OSD=1 (thanks to Stefan Huelswitt).

6
dvbapi.c
View File

@ -7,7 +7,7 @@
* DVD support initially written by Andreas Schultz <aschultz@warp10.net> * DVD support initially written by Andreas Schultz <aschultz@warp10.net>
* based on dvdplayer-0.5 by Matjaz Thaler <matjaz.thaler@guest.arnes.si> * based on dvdplayer-0.5 by Matjaz Thaler <matjaz.thaler@guest.arnes.si>
* *
* $Id: dvbapi.c 1.147 2002/02/02 13:04:00 kls Exp $ * $Id: dvbapi.c 1.148 2002/02/16 12:55:33 kls Exp $
*/ */
//#define DVDDEBUG 1 //#define DVDDEBUG 1
@ -3017,7 +3017,9 @@ void cDvbApi::Text(int x, int y, const char *s, eDvbColor colorFg, eDvbColor col
void cDvbApi::Flush(void) void cDvbApi::Flush(void)
{ {
#ifndef DEBUG_OSD #ifdef DEBUG_OSD
refresh();
#else
if (osd) if (osd)
osd->Flush(); osd->Flush();
#endif #endif

15
tools.c
View File

@ -4,17 +4,13 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: tools.c 1.57 2002/02/05 18:16:52 kls Exp $ * $Id: tools.c 1.58 2002/02/16 12:41:44 kls Exp $
*/ */
#include "tools.h" #include "tools.h"
#include <ctype.h> #include <ctype.h>
#include <dirent.h> #include <dirent.h>
#include <errno.h> #include <errno.h>
#if defined(DEBUG_OSD)
#include <ncurses.h>
#undef ERR //XXX ncurses defines this - but this clashes with newer system header files
#endif
#include <stdlib.h> #include <stdlib.h>
#include <sys/time.h> #include <sys/time.h>
#include <time.h> #include <time.h>
@ -545,9 +541,6 @@ bool cFile::Ready(bool Wait)
bool cFile::AnyFileReady(int FileDes, int TimeoutMs) bool cFile::AnyFileReady(int FileDes, int TimeoutMs)
{ {
#ifdef DEBUG_OSD
refresh();
#endif
fd_set set; fd_set set;
FD_ZERO(&set); FD_ZERO(&set);
for (int i = 0; i < maxFiles; i++) { for (int i = 0; i < maxFiles; i++) {
@ -566,9 +559,6 @@ bool cFile::AnyFileReady(int FileDes, int TimeoutMs)
bool cFile::FileReady(int FileDes, int TimeoutMs) bool cFile::FileReady(int FileDes, int TimeoutMs)
{ {
#ifdef DEBUG_OSD
refresh();
#endif
fd_set set; fd_set set;
struct timeval timeout; struct timeval timeout;
FD_ZERO(&set); FD_ZERO(&set);
@ -582,9 +572,6 @@ bool cFile::FileReady(int FileDes, int TimeoutMs)
bool cFile::FileReadyForWriting(int FileDes, int TimeoutMs) bool cFile::FileReadyForWriting(int FileDes, int TimeoutMs)
{ {
#ifdef DEBUG_OSD
refresh();
#endif
fd_set set; fd_set set;
struct timeval timeout; struct timeval timeout;
FD_ZERO(&set); FD_ZERO(&set);