From 2db9104f97679c2756816867dca581cd62a818c8 Mon Sep 17 00:00:00 2001 From: ghost Date: Fri, 12 Dec 2008 12:57:46 +0100 Subject: [PATCH] fix return values to python --- lib/dvb/frontend.h | 16 ++++++++-------- lib/dvb/idvb.h | 19 ++++++++++--------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/lib/dvb/frontend.h b/lib/dvb/frontend.h index 06ed12c..6e272ac 100644 --- a/lib/dvb/frontend.h +++ b/lib/dvb/frontend.h @@ -20,22 +20,22 @@ public: { } - RESULT getSystem(int &type) const; - RESULT getDVBS(eDVBFrontendParametersSatellite &) const; - RESULT getDVBC(eDVBFrontendParametersCable &) const; - RESULT getDVBT(eDVBFrontendParametersTerrestrial &) const; + SWIG_VOID(RESULT) getSystem(int &SWIG_OUTPUT) const; + SWIG_VOID(RESULT) getDVBS(eDVBFrontendParametersSatellite &SWIG_OUTPUT) const; + SWIG_VOID(RESULT) getDVBC(eDVBFrontendParametersCable &SWIG_OUTPUT) const; + SWIG_VOID(RESULT) getDVBT(eDVBFrontendParametersTerrestrial &SWIG_OUTPUT) const; RESULT setDVBS(const eDVBFrontendParametersSatellite &p, bool no_rotor_command_on_tune=false); RESULT setDVBC(const eDVBFrontendParametersCable &p); RESULT setDVBT(const eDVBFrontendParametersTerrestrial &p); - + SWIG_VOID(RESULT) getFlags(unsigned int &SWIG_NAMED_OUTPUT(flags)) const { flags = m_flags; return 0; } + RESULT setFlags(unsigned int flags) { m_flags = flags; return 0; } +#ifndef SWIG RESULT calculateDifference(const iDVBFrontendParameters *parm, int &, bool exact) const; RESULT getHash(unsigned long &) const; RESULT calcLockTimeout(unsigned int &) const; - - RESULT getFlags(unsigned int &flags) const { flags = m_flags; return 0; } - RESULT setFlags(unsigned int flags) { m_flags = flags; return 0; } +#endif }; #ifndef SWIG diff --git a/lib/dvb/idvb.h b/lib/dvb/idvb.h index 5fc633a..9eaac59 100644 --- a/lib/dvb/idvb.h +++ b/lib/dvb/idvb.h @@ -404,15 +404,16 @@ class iDVBFrontendParameters: public iObject #endif public: enum { flagOnlyFree = 1 }; - virtual RESULT getSystem(int &SWIG_OUTPUT) const = 0; - virtual RESULT getDVBS(eDVBFrontendParametersSatellite &SWIG_OUTPUT) const = 0; - virtual RESULT getDVBC(eDVBFrontendParametersCable &SWIG_OUTPUT) const = 0; - virtual RESULT getDVBT(eDVBFrontendParametersTerrestrial &SWIG_OUTPUT) const = 0; - - virtual RESULT calculateDifference(const iDVBFrontendParameters *parm, int &SWIG_OUTPUT, bool exact) const = 0; - virtual RESULT getHash(unsigned long &SWIG_OUTPUT) const = 0; - virtual RESULT calcLockTimeout(unsigned int &) const = 0; - virtual RESULT getFlags(unsigned int &) const = 0; + virtual SWIG_VOID(RESULT) getSystem(int &SWIG_OUTPUT) const = 0; + virtual SWIG_VOID(RESULT) getDVBS(eDVBFrontendParametersSatellite &SWIG_OUTPUT) const = 0; + virtual SWIG_VOID(RESULT) getDVBC(eDVBFrontendParametersCable &SWIG_OUTPUT) const = 0; + virtual SWIG_VOID(RESULT) getDVBT(eDVBFrontendParametersTerrestrial &SWIG_OUTPUT) const = 0; + virtual SWIG_VOID(RESULT) getFlags(unsigned int &SWIG_OUTPUT) const = 0; +#ifndef SWIG + virtual SWIG_VOID(RESULT) calculateDifference(const iDVBFrontendParameters *parm, int &, bool exact) const = 0; + virtual SWIG_VOID(RESULT) getHash(unsigned long &) const = 0; + virtual SWIG_VOID(RESULT) calcLockTimeout(unsigned int &) const = 0; +#endif }; SWIG_TEMPLATE_TYPEDEF(ePtr, iDVBFrontendParametersPtr); -- 2.7.4