From e57f94d8f1156deee0874d24c33c98d600c9af0d Mon Sep 17 00:00:00 2001 From: ghost Date: Tue, 10 Mar 2009 12:04:41 +0100 Subject: [PATCH] fix readCICaIds call --- lib/dvb_ci/dvbci.cpp | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/lib/dvb_ci/dvbci.cpp b/lib/dvb_ci/dvbci.cpp index a68edea8..a0166355 100644 --- a/lib/dvb_ci/dvbci.cpp +++ b/lib/dvb_ci/dvbci.cpp @@ -921,13 +921,18 @@ PyObject *eDVBCIInterfaces::readCICaIds(int slotid) char tmp[255]; snprintf(tmp, 255, "eDVBCIInterfaces::readCICaIds try to get CAIds for CI Slot %d... but just %d slots are available", slotid, m_slots.size()); PyErr_SetString(PyExc_StandardError, tmp); - return 0; } - int idx=0; - ePyObject list = PyList_New(slot->possible_caids.size()); - for (caidSet::iterator it = slot->possible_caids.begin(); it != slot->possible_caids.end(); ++it) - PyList_SET_ITEM(list, idx++, PyLong_FromLong(*it)); - return list; + else + { + int idx=0; + eDVBCICAManagerSession *ca_manager = slot->getCAManager(); + const std::vector &ci_caids = ca_manager->getCAIDs(); + ePyObject list = PyList_New(ci_caids.size()); + for (std::vector::const_iterator it = ci_caids.begin(); it != ci_caids.end(); ++it) + PyList_SET_ITEM(list, idx++, PyLong_FromLong(*it)); + return list; + } + return 0; } int eDVBCISlot::send(const unsigned char *data, size_t len) -- 2.30.2