X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/2bc720f79ea42168572ba458fec5b2cffb175a04..0f9371c1c276eecc360c0051ef073a6974765340:/lib/dvb/dvb.h

diff --git a/lib/dvb/dvb.h b/lib/dvb/dvb.h
index 4ca986b1..692ae839 100644
--- a/lib/dvb/dvb.h
+++ b/lib/dvb/dvb.h
@@ -125,9 +125,9 @@ private:
 	eSmartPtrList<eDVBFrontend> m_frontend;
 	eSmartPtrList<eDVBDemux>    m_demux;
 };
-
 #endif // SWIG
 
+SWIG_IGNORE(eDVBResourceManager);
 class eDVBResourceManager: public iObject, public Object
 {
 	DECLARE_REF(eDVBResourceManager);
@@ -175,7 +175,7 @@ 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;
@@ -197,23 +197,30 @@ public:
 		errNoDemux    = -2,
 		errChidNotFound = -3
 	};
-
+	
 	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);
 	RESULT allocatePVRChannel(eUsePtr<iDVBPVRChannel> &channel);
+	static RESULT getInstance(ePtr<eDVBResourceManager> &);
 #ifdef SWIG
 public:
 #endif
 	PSignal1<void,int> frontendUseMaskChanged;
-	RESULT allocateRawChannel(eUsePtr<iDVBChannel> &, int frontend_index);
-	static RESULT getInstance(ePtr<eDVBResourceManager> &);
+	SWIG_VOID(RESULT) allocateRawChannel(eUsePtr<iDVBChannel> &SWIG_OUTPUT, int frontend_index);
 };
-TEMPLATE_TYPEDEF(ePtr<eDVBResourceManager>, eDVBResourceManagerPtr);
-#ifndef SWIG
+SWIG_TEMPLATE_TYPEDEF(ePtr<eDVBResourceManager>, eDVBResourceManager);
+SWIG_EXTEND(ePtr<eDVBResourceManager>,
+	static ePtr<eDVBResourceManager> getInstance()
+	{
+		extern ePtr<eDVBResourceManager> NewResourceManagerPtr(void);
+		return NewResourceManagerPtr();
+	}
+);
 
+#ifndef SWIG
 	/* iDVBPVRChannel includes iDVBChannel. don't panic. */
 class eDVBChannel: public iDVBPVRChannel, public iFilePushScatterGather, public Object
 {
@@ -289,6 +296,6 @@ private:
 	void AddUse();
 	void ReleaseUse();
 };
-
 #endif // SWIG
+
 #endif