git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add possibility to change start/end time in timer edit with Vol/Bouquet +/- (thx...
[enigma2.git]
/
lib
/
service
/
servicedvb.cpp
diff --git
a/lib/service/servicedvb.cpp
b/lib/service/servicedvb.cpp
index 4141236a7df521abde818014e08a5e7ff703890c..f3183fef09a910f2b511cd0eb7359f0357c469df 100644
(file)
--- a/
lib/service/servicedvb.cpp
+++ b/
lib/service/servicedvb.cpp
@@
-109,7
+109,7
@@
static void PutToDict(ePyObject &dict, const char*key, long value)
eDebug("could not create PyObject for %s", key);
}
eDebug("could not create PyObject for %s", key);
}
-extern void PutToDict(ePyObject &dict, const char*key, const char *value);
+extern void PutToDict(ePyObject &dict, const char*key, const char *value);
// defined in dvb/frontend.cpp
void PutSatelliteDataToDict(ePyObject &dict, eDVBFrontendParametersSatellite &feparm)
{
void PutSatelliteDataToDict(ePyObject &dict, eDVBFrontendParametersSatellite &feparm)
{
@@
-2197,8
+2197,8
@@
PyObject *eDVBServicePlay::getCutList()
for (std::multiset<struct cueEntry>::iterator i(m_cue_entries.begin()); i != m_cue_entries.end(); ++i)
{
ePyObject tuple = PyTuple_New(2);
for (std::multiset<struct cueEntry>::iterator i(m_cue_entries.begin()); i != m_cue_entries.end(); ++i)
{
ePyObject tuple = PyTuple_New(2);
- PyTuple_S
etItem
(tuple, 0, PyLong_FromLongLong(i->where));
- PyTuple_S
etItem
(tuple, 1, PyInt_FromLong(i->what));
+ PyTuple_S
ET_ITEM
(tuple, 0, PyLong_FromLongLong(i->where));
+ PyTuple_S
ET_ITEM
(tuple, 1, PyInt_FromLong(i->what));
PyList_Append(list, tuple);
Py_DECREF(tuple);
}
PyList_Append(list, tuple);
Py_DECREF(tuple);
}
@@
-3020,23
+3020,23
@@
RESULT eDVBServicePlay::stream(ePtr<iStreamableService> &ptr)
return 0;
}
return 0;
}
+extern void PutToDict(ePyObject &dict, const char*key, ePyObject item); // defined in dvb/frontend.cpp
+
PyObject *eDVBServicePlay::getStreamingData()
{
eDVBServicePMTHandler::program program;
if (m_service_handler.getProgramInfo(program))
{
PyObject *eDVBServicePlay::getStreamingData()
{
eDVBServicePMTHandler::program program;
if (m_service_handler.getProgramInfo(program))
{
- Py_INCREF(Py_None);
- return Py_None;
+ Py_RETURN_NONE;
}
}
-
PyObject *
r = program.createPythonObject();
+
ePyObject
r = program.createPythonObject();
ePtr<iDVBDemux> demux;
if (!m_service_handler.getDataDemux(demux))
{
uint8_t demux_id;
ePtr<iDVBDemux> demux;
if (!m_service_handler.getDataDemux(demux))
{
uint8_t demux_id;
- demux->getCADemuxID(demux_id);
-
- PyDict_SetItemString(r, "demux", PyInt_FromLong(demux_id));
+ if (!demux->getCADemuxID(demux_id))
+ PutToDict(r, "demux", PyInt_FromLong(demux_id));
}
return r;
}
return r;