X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/f2c69b1c3a49b8b03866894fe3e3f3a4f330f517..ba1b105a176e5f62faf9d6d1f4c1a4c19764a2e4:/lib/dvb/dvb.h

diff --git a/lib/dvb/dvb.h b/lib/dvb/dvb.h
index 3451e48b..037c1974 100644
--- a/lib/dvb/dvb.h
+++ b/lib/dvb/dvb.h
@@ -23,6 +23,7 @@ class eDVBRegisteredFrontend: public iObject, public Object
 {
 	DECLARE_REF(eDVBRegisteredFrontend);
 	eTimer *disable;
+	Signal0<void> stateChanged;
 	void closeFrontend()
 	{
 		if (!m_inuse && m_frontend->closeFrontend()) // frontend busy
@@ -38,12 +39,18 @@ public:
 	void dec_use()
 	{
 		if (!--m_inuse)
+		{
+			/* emit */ stateChanged();
 			disable->start(3000, true);
+		}
 	}
 	void inc_use()
 	{
 		if (++m_inuse == 1)
+		{
 			m_frontend->openFrontend();
+			/* emit */ stateChanged();
+		}
 	}
 	iDVBAdapter *m_adapter;
 	ePtr<eDVBFrontend> m_frontend;
@@ -168,13 +175,14 @@ class eDVBResourceManager: public iObject, public Object
 
 	Signal1<void,eDVBChannel*> m_channelAdded;
 
-	bool canAllocateFrontend(ePtr<iDVBFrontendParameters> &feparm);
+	int canAllocateFrontend(ePtr<iDVBFrontendParameters> &feparm);
 
 	eUsePtr<iDVBChannel> m_cached_channel;
 	Connection m_cached_channel_state_changed_conn;
 	eTimer m_releaseCachedChannelTimer;
 	void DVBChannelStateChanged(iDVBChannel*);
 	void releaseCachedChannel();
+	void feStateChanged();
 #ifndef SWIG
 public:
 #endif
@@ -191,7 +199,7 @@ public:
 	};
 
 	RESULT connectChannelAdded(const Slot1<void,eDVBChannel*> &channelAdded, ePtr<eConnection> &connection);
-	bool canAllocateChannel(const eDVBChannelID &channelid, const eDVBChannelID &ignore);
+	int canAllocateChannel(const eDVBChannelID &channelid, const eDVBChannelID &ignore);
 
 		/* allocate channel... */
 	RESULT allocateChannel(const eDVBChannelID &channelid, eUsePtr<iDVBChannel> &channel);
@@ -199,10 +207,11 @@ public:
 #ifdef SWIG
 public:
 #endif
-	RESULT allocateRawChannel(eUsePtr<iDVBChannel> &channel, int frontend_index);
-	static RESULT getInstance(ePtr<eDVBResourceManager> &ptr) { if (instance) { ptr = instance; return 0; } return -1; }
+	PSignal1<void,int> frontendUseMaskChanged;
+	RESULT allocateRawChannel(eUsePtr<iDVBChannel> &, int frontend_index);
+	static RESULT getInstance(ePtr<eDVBResourceManager> &);
 };
-
+TEMPLATE_TYPEDEF(ePtr<eDVBResourceManager>, eDVBResourceManagerPtr);
 #ifndef SWIG
 
 	/* iDVBPVRChannel includes iDVBChannel. don't panic. */