diff options
| author | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2006-03-09 12:20:41 +0000 |
|---|---|---|
| committer | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2006-03-09 12:20:41 +0000 |
| commit | 4008892983b7a8348b24dccea5f6f98826adc2d6 (patch) | |
| tree | 4bd3bfc6658c2e6f11704467648cd34da7f32bb3 | |
| parent | 86b8f5aa0210c001728962c5df30bc6e55ce220f (diff) | |
| download | enigma2-4008892983b7a8348b24dccea5f6f98826adc2d6.tar.gz enigma2-4008892983b7a8348b24dccea5f6f98826adc2d6.zip | |
more python fixes
| -rw-r--r-- | lib/dvb/dvb.cpp | 10 | ||||
| -rw-r--r-- | lib/dvb/dvb.h | 6 | ||||
| -rw-r--r-- | lib/dvb/idvb.h | 4 |
3 files changed, 15 insertions, 5 deletions
diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp index 86b1965e..8c874e86 100644 --- a/lib/dvb/dvb.cpp +++ b/lib/dvb/dvb.cpp @@ -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) { diff --git a/lib/dvb/dvb.h b/lib/dvb/dvb.h index 3451e48b..3ad3cc1b 100644 --- a/lib/dvb/dvb.h +++ b/lib/dvb/dvb.h @@ -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. */ diff --git a/lib/dvb/idvb.h b/lib/dvb/idvb.h index 16e0747c..6bfbc216 100644 --- a/lib/dvb/idvb.h +++ b/lib/dvb/idvb.h @@ -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 |