summaryrefslogtreecommitdiff
path: root/eit.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <kls (at) cadsoft (dot) de>2002-08-16 18:00:00 +0200
committerKlaus Schmidinger <kls (at) cadsoft (dot) de>2002-08-16 18:00:00 +0200
commited643353b100bee75459c4ef2d0330e7a04e1f2a (patch)
tree8a424eba464677a71309e1125ce4e7acef58607e /eit.c
parent527748826c8d3cfacff8a7ab3fda9551c1182590 (diff)
downloadvdr-patch-lnbsharing-ed643353b100bee75459c4ef2d0330e7a04e1f2a.tar.gz
vdr-patch-lnbsharing-ed643353b100bee75459c4ef2d0330e7a04e1f2a.tar.bz2
Version 1.1.7vdr-1.1.7
- Adapted VDR to the NEWSTRUCT driver. To use the new driver, compile VDR with 'make NEWSTRUCT=1' (thanks to Holger Wächtler for some valuable advice). By default it currently still uses the old driver. - Added some missing #includes (thanks to Martin Hammerschmid). - Changed the log error message "can't record MPEG1!" to "error in data stream!", since the mentioning of MPEG1 has irritated many people. - Consistently using malloc/free and new/delete (thanks to Andreas Schultz). - Temporarily made cDevice::ProvidesCa() virtual (Andreas Schultz needs this in his DXR3 plugin). - cDevice no longer exposes a file handle to cPlayer. A derived cPlayer class can now call DevicePoll() to see whether the replay device is ready for further data. A derived cDevice class must implement Poll() and shall check if any of its file handles is ready for data. - Implemented several replay modes to allow players that play only audio (thanks to Stefan Huelswitt). - Improved cCondVar::Wait() and implemented cCondVar::TimedWait() (thanks to Stefan Huelswitt). - VDR no longer gives up if there is no DVB device. It continues to work if there is at least one device, either a DVB device found by the core VDR code itself, or a device implemented by a plugin.
Diffstat (limited to 'eit.c')
-rw-r--r--eit.c22
1 files changed, 13 insertions, 9 deletions
diff --git a/eit.c b/eit.c
index f5d98f5..ca31913 100644
--- a/eit.c
+++ b/eit.c
@@ -16,7 +16,7 @@
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
- * $Id: eit.c 1.46 2002/05/31 10:26:56 kls Exp $
+ * $Id: eit.c 1.48 2002/08/11 11:11:12 kls Exp $
***************************************************************************/
#include "eit.h"
@@ -26,7 +26,11 @@
#include <iomanip.h>
#include <iostream.h>
#include <limits.h>
+#ifdef NEWSTRUCT
+#include <linux/dvb/dmx.h>
+#else
#include <ost/dmx.h>
+#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -198,9 +202,9 @@ cEventInfo::cEventInfo(unsigned short serviceid, unsigned short eventid)
cEventInfo::~cEventInfo()
{
- delete pTitle;
- delete pSubtitle;
- delete pExtendedDescription;
+ free(pTitle);
+ free(pSubtitle);
+ free(pExtendedDescription);
}
/** */
@@ -496,8 +500,8 @@ void cEventInfo::FixEpgBugs(void)
*e = 0;
char *s = strdup(p + 1);
char *d = strdup(e + strlen(delim));
- delete pSubtitle;
- delete pExtendedDescription;
+ free(pSubtitle);
+ free(pExtendedDescription);
pSubtitle = s;
pExtendedDescription = d;
EpgBugFixStat(0, GetServiceID());
@@ -527,7 +531,7 @@ void cEventInfo::FixEpgBugs(void)
// Title
//
if (pSubtitle && strcmp(pTitle, pSubtitle) == 0) {
- delete pSubtitle;
+ free(pSubtitle);
pSubtitle = NULL;
EpgBugFixStat(2, GetServiceID());
}
@@ -997,10 +1001,10 @@ cSIProcessor::~cSIProcessor()
active = false;
Cancel(3);
ShutDownFilters();
- delete filters;
+ free(filters);
if (!--numSIProcessors) // the last one deletes it
delete schedules;
- delete fileName;
+ free(fileName);
}
const cSchedules *cSIProcessor::Schedules(cMutexLock &MutexLock)