fix

diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp
index 3e2efbe7cfba07752395815f4dda1fd353d992cd..7b71ca13ac5a6d0b17aa8179e1731fb00464b154 100644 (file)
--- a/lib/dvb/frontend.cpp
+++ b/lib/dvb/frontend.cpp
@@ -53,8 +53,10 @@
 #include <dvbsi++/cable_delivery_system_descriptor.h>
 #include <dvbsi++/terrestrial_delivery_system_descriptor.h>
 
 #include <dvbsi++/cable_delivery_system_descriptor.h>
 #include <dvbsi++/terrestrial_delivery_system_descriptor.h>
 

-void eDVBDiseqcCommand::setData(const char *str)
+void eDVBDiseqcCommand::setCommandString(const char *str)

 {
 {

+       if (!str)
+               return;

        len = strlen(str);
        if (len > MAX_DISEQC_LENGTH)
                len = MAX_DISEQC_LENGTH;
        len = strlen(str);
        if (len > MAX_DISEQC_LENGTH)
                len = MAX_DISEQC_LENGTH;

diff --git a/lib/dvb/idvb.h b/lib/dvb/idvb.h
index a6a19fff1bac47bad472aff53ab90dc8df6c8c5f..16e0747cee5e0742f13ef438f0563e0389262e27 100644 (file)
--- a/lib/dvb/idvb.h
+++ b/lib/dvb/idvb.h
@@ -323,16 +323,19 @@ public:
 
 class eDVBDiseqcCommand
 {
 
 class eDVBDiseqcCommand
 {

+#ifndef SWIG

 public:
 public:

+#endif

        int len;
        int len;

-#ifndef SWIG

        __u8 data[MAX_DISEQC_LENGTH];
 #if HAVE_DVB_API_VERSION < 3
        int tone;
        int voltage;
 #endif
        __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;
 };
 
 class iDVBSatelliteEquipmentControl;