more python fixes

[enigma2.git] / lib / dvb / idvb.h

diff --git a/lib/dvb/idvb.h b/lib/dvb/idvb.h
index a6a19fff1bac47bad472aff53ab90dc8df6c8c5f..6bfbc2164aaa03d15373c54e5d5591ca05de813d 100644 (file)
--- a/lib/dvb/idvb.h
+++ b/lib/dvb/idvb.h
@@ -323,16 +323,19 @@ public:
 
 class eDVBDiseqcCommand
 {
+#ifndef SWIG
 public:
+#endif
        int len;
-#ifndef SWIG
        __u8 data[MAX_DISEQC_LENGTH];
 #if HAVE_DVB_API_VERSION < 3
        int tone;
        int voltage;
 #endif
-#endif //SWIG
-       void setData(const char *str);
+#ifdef SWIG
+public:
+#endif
+       void setCommandString(const char *str);
 };
 
 class iDVBSatelliteEquipmentControl;
@@ -417,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;
@@ -442,7 +445,7 @@ public:
        virtual void ReleaseUse() = 0;
 #endif
 };
-TEMPLATE_TYPEDEF(ePtr<iDVBChannel>, iDVBChannelPtr);
+TEMPLATE_TYPEDEF(eUsePtr<iDVBChannel>, iDVBChannelPtr);
 
 #ifndef SWIG