1
0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00

Fixed a segfault that sometimes happened when killing VDR

This commit is contained in:
Klaus Schmidinger 2001-03-31 15:04:37 +02:00
parent 2eebbba75e
commit f3f2d4577d
4 changed files with 695 additions and 690 deletions

View File

@ -444,3 +444,4 @@ Video Disk Recorder Revision History
CAM card for FTA recordings unless necessary. This is only important for CAM card for FTA recordings unless necessary. This is only important for
systems with three or more DVB cards. systems with three or more DVB cards.
- Added the "statdvb2vdr" tool from Hans-Peter Raschke. - Added the "statdvb2vdr" tool from Hans-Peter Raschke.
- Fixed a segfault that sometimes happened when killing VDR.

View File

@ -4,7 +4,7 @@
* 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: dvbapi.c 1.65 2001/03/31 10:46:17 kls Exp $ * $Id: dvbapi.c 1.66 2001/03/31 15:01:57 kls Exp $
*/ */
#include "dvbapi.h" #include "dvbapi.h"
@ -1488,7 +1488,7 @@ cDvbApi::~cDvbApi()
StopTransfer(); StopTransfer();
OvlO(false); //Overlay off! OvlO(false); //Overlay off!
//XXX the following call sometimes causes a segfault - driver problem? //XXX the following call sometimes causes a segfault - driver problem?
close(videoDev); //XXX close(videoDev);
} }
#if defined(DEBUG_OSD) || defined(REMOTE_KBD) #if defined(DEBUG_OSD) || defined(REMOTE_KBD)
endwin(); endwin();

1369
eit.c

File diff suppressed because it is too large Load Diff

11
eit.h
View File

@ -13,7 +13,7 @@
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. * * (at your option) any later version. *
* * * *
* $Id: eit.h 1.4 2000/11/24 14:35:22 kls Exp $ * $Id: eit.h 1.5 2001/03/31 12:42:52 kls Exp $
***************************************************************************/ ***************************************************************************/
#ifndef __EIT_H #ifndef __EIT_H
@ -49,7 +49,7 @@ protected:
bool SetSubtitle(char *string); bool SetSubtitle(char *string);
void IncreaseExtendedDescriptorNumber(void); void IncreaseExtendedDescriptorNumber(void);
cEventInfo(unsigned short serviceid, unsigned short eventid); cEventInfo(unsigned short serviceid, unsigned short eventid);
public: public:
~cEventInfo(); ~cEventInfo();
const char *GetTimeString(void) const; const char *GetTimeString(void) const;
const char *GetEndTimeString(void) const; const char *GetEndTimeString(void) const;
@ -84,7 +84,7 @@ protected:
void Cleanup(time_t tTime); void Cleanup(time_t tTime);
void Cleanup(void); void Cleanup(void);
cSchedule(unsigned short servid = 0); cSchedule(unsigned short servid = 0);
public: public:
~cSchedule(); ~cSchedule();
const cEventInfo *GetPresentEvent(void) const; const cEventInfo *GetPresentEvent(void) const;
const cEventInfo *GetFollowingEvent(void) const; const cEventInfo *GetFollowingEvent(void) const;
@ -104,7 +104,7 @@ private:
protected: protected:
bool SetCurrentServiceID(unsigned short servid); bool SetCurrentServiceID(unsigned short servid);
void Cleanup(); void Cleanup();
public: public:
cSchedules(void); cSchedules(void);
~cSchedules(); ~cSchedules();
const cSchedule *GetSchedule(unsigned short servid) const; const cSchedule *GetSchedule(unsigned short servid) const;
@ -130,9 +130,10 @@ private:
bool useTStime; bool useTStime;
SIP_FILTER *filters; SIP_FILTER *filters;
int fsvbi; int fsvbi;
bool active;
bool RefreshFilters(void); bool RefreshFilters(void);
void Action(void); void Action(void);
public: public:
cSIProcessor(const char *FileName); cSIProcessor(const char *FileName);
~cSIProcessor(); ~cSIProcessor();
bool SetUseTSTime(bool use); bool SetUseTSTime(bool use);