more python fixes
authorAndreas Monzner <andreas.monzner@multimedia-labs.de>
Thu, 9 Mar 2006 12:20:41 +0000 (12:20 +0000)
committerAndreas Monzner <andreas.monzner@multimedia-labs.de>
Thu, 9 Mar 2006 12:20:41 +0000 (12:20 +0000)
lib/dvb/dvb.cpp
lib/dvb/dvb.h
lib/dvb/idvb.h

index 86b1965..8c874e8 100644 (file)
@@ -42,6 +42,16 @@ DEFINE_REF(eDVBResourceManager);
 
 eDVBResourceManager *eDVBResourceManager::instance;
 
+RESULT eDVBResourceManager::getInstance(ePtr<eDVBResourceManager> &ptr)
+{
+       if (instance)
+       {
+               ptr = instance;
+               return 0;
+       }
+       return -1;
+}
+
 eDVBResourceManager::eDVBResourceManager()
        :m_releaseCachedChannelTimer(eApp)
 {
index 3451e48..3ad3cc1 100644 (file)
@@ -199,10 +199,10 @@ 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; }
+       RESULT allocateRawChannel(eUsePtr<iDVBChannel> &SWIG_OUTPUT, int frontend_index);
+       static RESULT getInstance(ePtr<eDVBResourceManager> &SWIG_OUTPUT);
 };
-
+TEMPLATE_TYPEDEF(ePtr<eDVBResourceManager>, eDVBResourceManagerPtr);
 #ifndef SWIG
 
        /* iDVBPVRChannel includes iDVBChannel. don't panic. */
index 16e0747..6bfbc21 100644 (file)
@@ -420,7 +420,7 @@ public:
        virtual RESULT getState(int &state)=0;  
 
                /* direct frontend access for raw channels and/or status inquiries. */
-       virtual RESULT getFrontend(ePtr<iDVBFrontend> &frontend)=0;
+       virtual RESULT getFrontend(ePtr<iDVBFrontend> &SWIG_OUTPUT)=0;
 
 #ifndef SWIG
        virtual RESULT getCurrentFrontendParameters(ePtr<iDVBFrontendParameters> &)=0;
@@ -445,7 +445,7 @@ public:
        virtual void ReleaseUse() = 0;
 #endif
 };
-TEMPLATE_TYPEDEF(ePtr<iDVBChannel>, iDVBChannelPtr);
+TEMPLATE_TYPEDEF(eUsePtr<iDVBChannel>, iDVBChannelPtr);
 
 #ifndef SWIG