some thread related fixes

[enigma2.git] / lib / dvb / pmt.cpp

diff --git a/lib/dvb/pmt.cpp b/lib/dvb/pmt.cpp
index 1b1455e4f58c01dc78efee438a82156db10659ec..e70942009136e8739c1562878f743385302d9472 100644 (file)
--- a/lib/dvb/pmt.cpp
+++ b/lib/dvb/pmt.cpp
@@ -87,9 +87,9 @@ void eDVBServicePMTHandler::PMTready(int error)
        {
                m_have_cached_program = false;
                serviceEvent(eventNewProgramInfo);
-               eEPGCache::getInstance()->PMTready(this);
                if (!m_pvr_channel) // don't send campmt to camd.socket for playbacked services
                {
+                       eEPGCache::getInstance()->PMTready(this);
                        if(!m_ca_servicePtr)
                        {
                                int demuxes[2] = {0,0};
@@ -865,36 +865,42 @@ static PyObject *createTuple(int pid, const char *type)
        return r;
 }
 
+static inline void PyList_AppendSteal(PyObject *list, PyObject *item)
+{
+       PyList_Append(list, item);
+       Py_DECREF(item);
+}
+
 PyObject *eDVBServicePMTHandler::program::createPythonObject()
 {
        PyObject *r = PyDict_New();
 
        PyObject *l = PyList_New(0);
        
-       PyList_Append(l, createTuple(0, "pat"));
+       PyList_AppendSteal(l, createTuple(0, "pat"));
 
        if (pmtPid != -1)
-               PyList_Append(l, createTuple(pmtPid, "pmt"));
+               PyList_AppendSteal(l, createTuple(pmtPid, "pmt"));
        
        for (std::vector<eDVBServicePMTHandler::videoStream>::const_iterator
                        i(videoStreams.begin()); 
                        i != videoStreams.end(); ++i)
-               PyList_Append(l, createTuple(i->pid, "video"));
+               PyList_AppendSteal(l, createTuple(i->pid, "video"));
 
        for (std::vector<eDVBServicePMTHandler::audioStream>::const_iterator
                        i(audioStreams.begin()); 
                        i != audioStreams.end(); ++i)
-               PyList_Append(l, createTuple(i->pid, "audio"));
+               PyList_AppendSteal(l, createTuple(i->pid, "audio"));
 
        for (std::vector<eDVBServicePMTHandler::subtitleStream>::const_iterator
                        i(subtitleStreams.begin());
                        i != subtitleStreams.end(); ++i)
-               PyList_Append(l, createTuple(i->pid, "subtitle"));
+               PyList_AppendSteal(l, createTuple(i->pid, "subtitle"));
 
-       PyList_Append(l, createTuple(pcrPid, "pcr"));
+       PyList_AppendSteal(l, createTuple(pcrPid, "pcr"));
 
        if (textPid != -1)
-               PyList_Append(l, createTuple(textPid, "text"));
+               PyList_AppendSteal(l, createTuple(textPid, "text"));
                
        PyDict_SetItemString(r, "pids", l);
        return r;