git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
By Anders Holst: only record MPEG-4 I-frames to ap-file
[enigma2.git]
/
lib
/
dvb
/
demux.cpp
diff --git
a/lib/dvb/demux.cpp
b/lib/dvb/demux.cpp
index 29bbf264c7f6fa71dea0ae40e6a43af7a7db486e..a0f1c326a9522f768afa375a2a92dbb37194ba5b 100644
(file)
--- a/
lib/dvb/demux.cpp
+++ b/
lib/dvb/demux.cpp
@@
-206,7
+206,7
@@
eDVBSectionReader::eDVBSectionReader(eDVBDemux *demux, eMainloop *context, RESUL
if (fd >= 0)
{
if (fd >= 0)
{
- notifier=
new eSocketNotifier
(context, fd, eSocketNotifier::Read, false);
+ notifier=
eSocketNotifier::create
(context, fd, eSocketNotifier::Read, false);
CONNECT(notifier->activated, eDVBSectionReader::data);
res = 0;
} else
CONNECT(notifier->activated, eDVBSectionReader::data);
res = 0;
} else
@@
-220,8
+220,6
@@
DEFINE_REF(eDVBSectionReader)
eDVBSectionReader::~eDVBSectionReader()
{
eDVBSectionReader::~eDVBSectionReader()
{
- if (notifier)
- delete notifier;
if (fd >= 0)
::close(fd);
}
if (fd >= 0)
::close(fd);
}
@@
-331,7
+329,7
@@
eDVBPESReader::eDVBPESReader(eDVBDemux *demux, eMainloop *context, RESULT &res):
{
::ioctl(m_fd, DMX_SET_BUFFER_SIZE, 64*1024);
::fcntl(m_fd, F_SETFL, O_NONBLOCK);
{
::ioctl(m_fd, DMX_SET_BUFFER_SIZE, 64*1024);
::fcntl(m_fd, F_SETFL, O_NONBLOCK);
- m_notifier =
new eSocketNotifier
(context, m_fd, eSocketNotifier::Read, false);
+ m_notifier =
eSocketNotifier::create
(context, m_fd, eSocketNotifier::Read, false);
CONNECT(m_notifier->activated, eDVBPESReader::data);
res = 0;
} else
CONNECT(m_notifier->activated, eDVBPESReader::data);
res = 0;
} else
@@
-345,8
+343,6
@@
DEFINE_REF(eDVBPESReader)
eDVBPESReader::~eDVBPESReader()
{
eDVBPESReader::~eDVBPESReader()
{
- if (m_notifier)
- delete m_notifier;
if (m_fd >= 0)
::close(m_fd);
}
if (m_fd >= 0)
::close(m_fd);
}