X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/6696994da0d59a3b483eda65d1dc8b1a9df67cc0..58ee3c3a218a0aa5d45e9c465eb9759375b4129c:/lib/dvb/dvb.h diff --git a/lib/dvb/dvb.h b/lib/dvb/dvb.h index bceb9ad0..1a773efa 100644 --- a/lib/dvb/dvb.h +++ b/lib/dvb/dvb.h @@ -22,7 +22,7 @@ class iDVBAdapter; class eDVBRegisteredFrontend: public iObject, public Object { DECLARE_REF(eDVBRegisteredFrontend); - eTimer *disable; + ePtr disable; void closeFrontend() { if (!m_inuse && m_frontend->closeFrontend()) // frontend busy @@ -31,14 +31,10 @@ class eDVBRegisteredFrontend: public iObject, public Object public: Signal0 stateChanged; eDVBRegisteredFrontend(eDVBFrontend *fe, iDVBAdapter *adap) - :disable(new eTimer(eApp)), m_adapter(adap), m_frontend(fe), m_inuse(0) + :disable(eTimer::create(eApp)), m_adapter(adap), m_frontend(fe), m_inuse(0) { CONNECT(disable->timeout, eDVBRegisteredFrontend::closeFrontend); } - ~eDVBRegisteredFrontend() - { - delete disable; - } void dec_use() { if (!--m_inuse) @@ -164,7 +160,7 @@ class eDVBResourceManager: public iObject, public Object eUsePtr m_cached_channel; Connection m_cached_channel_state_changed_conn; - eTimer m_releaseCachedChannelTimer; + ePtr m_releaseCachedChannelTimer; void DVBChannelStateChanged(iDVBChannel*); void feStateChanged(); #ifndef SWIG