remove unneeded signals ( eDVBChannel::m_stateChanged give us the same informations )
[enigma2.git] / lib / dvb / dvb.h
index a4652e8..d0deb2f 100644 (file)
@@ -132,10 +132,14 @@ class eDVBResourceManager: public iObject
        ePtr<iDVBChannelList> m_list;
        ePtr<iDVBSatelliteEquipmentControl> m_sec;
        static eDVBResourceManager *instance;
-
+       
        friend class eDVBChannel;
        RESULT addChannel(const eDVBChannelID &chid, eDVBChannel *ch);
        RESULT removeChannel(eDVBChannel *ch);
+       
+       Signal1<void,eDVBChannel*> m_channelAdded;
+       Signal1<void,eDVBChannel*> m_channelRemoved;
+       Signal1<void,iDVBChannel*> m_channelRunning;
 public:
        eDVBResourceManager();
        virtual ~eDVBResourceManager();
@@ -152,10 +156,13 @@ public:
        };
        
                /* allocate channel... */
-       RESULT allocateChannel(const eDVBChannelID &channelid, ePtr<iDVBChannel> &channel);
-       RESULT allocateRawChannel(ePtr<iDVBChannel> &channel);
+       RESULT allocateChannel(const eDVBChannelID &channelid, eUsePtr<iDVBChannel> &channel);
+       RESULT allocateRawChannel(eUsePtr<iDVBChannel> &channel);
        RESULT allocatePVRChannel(int caps);
 
+       RESULT connectChannelAdded(const Slot1<void,eDVBChannel*> &channelAdded, ePtr<eConnection> &connection);
+       RESULT connectChannelRemoved(const Slot1<void,eDVBChannel*> &channelRemoved, ePtr<eConnection> &connection);
+       RESULT connectChannelRunning(const Slot1<void,iDVBChannel*> &channelRemoved, ePtr<eConnection> &connection);
 };
 
 class eDVBChannel: public iDVBChannel, public Object
@@ -175,13 +182,20 @@ private:
        
        void frontendStateChanged(iDVBFrontend*fe);
        ePtr<eConnection> m_conn_frontendStateChanged;
+
+       friend class eUsePtr<eDVBChannel>;
+               /* use count */
+       oRefCount m_use_count;
+       void AddUse();
+       void ReleaseUse();
 public:
        eDVBChannel(eDVBResourceManager *mgr, eDVBAllocatedFrontend *frontend, eDVBAllocatedDemux *demux);
        virtual ~eDVBChannel();
 
                /* only for managed channels - effectively tunes to the channelid. should not be used... */
        RESULT setChannel(const eDVBChannelID &id);
-       
+       eDVBChannelID getChannelID() { return m_channel_id; }
+
        RESULT connectStateChange(const Slot1<void,iDVBChannel*> &stateChange, ePtr<eConnection> &connection);
        RESULT getState(int &state);