X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fdvb%2Fdemux.cpp;h=a0f1c326a9522f768afa375a2a92dbb37194ba5b;hp=29bbf264c7f6fa71dea0ae40e6a43af7a7db486e;hb=10e7e45ae92d4fe06f70126ed256b87896dbc432;hpb=6bb94cd5b0d8fd3608afe84e8d76aef554a4b401;ds=sidebyside diff --git a/lib/dvb/demux.cpp b/lib/dvb/demux.cpp index 29bbf26..a0f1c32 100644 --- a/lib/dvb/demux.cpp +++ b/lib/dvb/demux.cpp @@ -206,7 +206,7 @@ eDVBSectionReader::eDVBSectionReader(eDVBDemux *demux, eMainloop *context, RESUL 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 @@ -220,8 +220,6 @@ DEFINE_REF(eDVBSectionReader) eDVBSectionReader::~eDVBSectionReader() { - if (notifier) - delete notifier; 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); - 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 @@ -345,8 +343,6 @@ DEFINE_REF(eDVBPESReader) eDVBPESReader::~eDVBPESReader() { - if (m_notifier) - delete m_notifier; if (m_fd >= 0) ::close(m_fd); }