fix error handling

diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp
index fa15d66289ddf5f13148b60514b3f8fd944cdcc8..4a6da0167ba29002a474295aa9f6f63ab48303ac 100644 (file)
--- a/lib/dvb/dvb.cpp
+++ b/lib/dvb/dvb.cpp
@@ -248,12 +248,12 @@ void eDVBResourceManager::addAdapter(iDVBAdapter *adapter)
        }
 }
 
-void eDVBResourceManager::setFrontendSlotInformations(ePyObject list)
+PyObject *eDVBResourceManager::setFrontendSlotInformations(ePyObject list)
 {
        if (!PyList_Check(list))
        {
                PyErr_SetString(PyExc_StandardError, "eDVBResourceManager::setFrontendSlotInformations argument should be a python list");
-               return;
+               return NULL;
        }
        if ((unsigned int)PyList_Size(list) != m_frontend.size())
        {
@@ -261,14 +261,16 @@ void eDVBResourceManager::setFrontendSlotInformations(ePyObject list)
                sprintf(blasel, "eDVBResourceManager::setFrontendSlotInformations list size incorrect %d frontends avail, but %d entries in slotlist",
                        m_frontend.size(), PyList_Size(list));
                PyErr_SetString(PyExc_StandardError, blasel);
-               return;
+               return NULL;
        }
        int pos=0;
        for (eSmartPtrList<eDVBRegisteredFrontend>::iterator i(m_frontend.begin()); i != m_frontend.end(); ++i)
        {
                ePyObject obj = PyList_GET_ITEM(list, pos++);
-               i->m_frontend->setSlotInfo(obj);
+               if (!i->m_frontend->setSlotInfo(obj))
+                       return NULL;
        }
+       Py_RETURN_NONE;
 }
 
 RESULT eDVBResourceManager::allocateFrontend(ePtr<eDVBAllocatedFrontend> &fe, ePtr<iDVBFrontendParameters> &feparm)

diff --git a/lib/dvb/dvb.h b/lib/dvb/dvb.h
index f36e6f6760a49433db08033a1accdb18968c6b70..38d18f782c5afba91fdb460a8d3722a8baa21c32 100644 (file)
--- a/lib/dvb/dvb.h
+++ b/lib/dvb/dvb.h
@@ -210,7 +210,7 @@ public:
 #endif
        PSignal1<void,int> frontendUseMaskChanged;
        SWIG_VOID(RESULT) allocateRawChannel(eUsePtr<iDVBChannel> &SWIG_OUTPUT, int slot_index);
-       void setFrontendSlotInformations(SWIG_PYOBJECT(ePyObject) list);
+       PyObject *setFrontendSlotInformations(SWIG_PYOBJECT(ePyObject) list);
 };
 SWIG_TEMPLATE_TYPEDEF(ePtr<eDVBResourceManager>, eDVBResourceManager);
 SWIG_EXTEND(ePtr<eDVBResourceManager>,

diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp
index 1906a8f44386a0b5943f63c48d3dfd31ed8391b9..8b21413025b512c905595737de6a38df8f7f9b95 100644 (file)
--- a/lib/dvb/frontend.cpp
+++ b/lib/dvb/frontend.cpp
@@ -2135,7 +2135,7 @@ int eDVBFrontend::isCompatibleWith(ePtr<iDVBFrontendParameters> &feparm)
        return 1;
 }
 
-void eDVBFrontend::setSlotInfo(ePyObject obj)
+bool eDVBFrontend::setSlotInfo(ePyObject obj)
 {
        ePyObject Id, Descr, Enabled;
        if (!PyTuple_Check(obj) || PyTuple_Size(obj) != 3)
@@ -2148,14 +2148,13 @@ void eDVBFrontend::setSlotInfo(ePyObject obj)
        strcpy(m_description, PyString_AS_STRING(Descr));
        m_slotid = PyInt_AsLong(Id);
        m_enabled = Enabled == Py_True;
-
        // HACK.. the rotor workaround is neede for all NIMs with LNBP21 voltage regulator...
        m_need_rotor_workaround = !!strstr(m_description, "Alps BSBE1") || !!strstr(m_description, "Alps -S");
-
        eDebug("setSlotInfo for dvb frontend %d to slotid %d, descr %s, need rotorworkaround %s, enabled %s",
                m_dvbid, m_slotid, m_description, m_need_rotor_workaround ? "Yes" : "No", m_enabled ? "Yes" : "No" );
-       return;
+       return true;
 arg_error:
        PyErr_SetString(PyExc_StandardError,
-               "eDVBFrontend::setSlotInfo must get a tuple with first param slotid and second param slot description");
+               "eDVBFrontend::setSlotInfo must get a tuple with first param slotid, second param slot description and third param enabled boolean");
+       return false;
 }

diff --git a/lib/dvb/frontend.h b/lib/dvb/frontend.h
index d2070e9656e1b38d3cd23c9fece9ab3e963fa530..6bf36466752deb42bf82df94c46980dd4d908d49 100644 (file)
--- a/lib/dvb/frontend.h
+++ b/lib/dvb/frontend.h
@@ -122,7 +122,7 @@ public:
        int isCompatibleWith(ePtr<iDVBFrontendParameters> &feparm);
        int getDVBID() { return m_dvbid; }
        int getSlotID() { return m_slotid; }
-       void setSlotInfo(ePyObject obj); // get a tuple (slotid, slotdescr)
+       bool setSlotInfo(ePyObject obj); // get a tuple (slotid, slotdescr)
 
        int openFrontend();
        int closeFrontend();