diff options
Diffstat (limited to 'lib/service/servicedvb.cpp')
| -rw-r--r-- | lib/service/servicedvb.cpp | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp index f3183fef..7a779e0c 100644 --- a/lib/service/servicedvb.cpp +++ b/lib/service/servicedvb.cpp @@ -96,7 +96,7 @@ int eStaticServiceDVBInformation::isPlayable(const eServiceReference &ref, const return false; } -static void PutToDict(ePyObject &dict, const char*key, long value) +static void PutToDictAsStr(ePyObject &dict, const char*key, long value) { ePyObject item = PyString_FromFormat("%d", value); if (item) @@ -109,15 +109,17 @@ static void PutToDict(ePyObject &dict, const char*key, long value) eDebug("could not create PyObject for %s", key); } +extern void PutToDict(ePyObject &dict, const char*key, long value); // defined in dvb/frontend.cpp +extern void PutToDict(ePyObject &dict, const char*key, ePyObject item); // defined in dvb/frontend.cpp extern void PutToDict(ePyObject &dict, const char*key, const char *value); // defined in dvb/frontend.cpp void PutSatelliteDataToDict(ePyObject &dict, eDVBFrontendParametersSatellite &feparm) { const char *tmp=0; PutToDict(dict, "type", "Satellite"); - PutToDict(dict, "frequency", feparm.frequency); - PutToDict(dict, "symbolrate", feparm.symbol_rate); - PutToDict(dict, "orbital position", feparm.orbital_position); + PutToDictAsStr(dict, "frequency", feparm.frequency); + PutToDictAsStr(dict, "symbolrate", feparm.symbol_rate); + PutToDictAsStr(dict, "orbital position", feparm.orbital_position); switch (feparm.inversion) { case eDVBFrontendParametersSatellite::Inversion::On: tmp="ON"; break; @@ -189,7 +191,7 @@ void PutSatelliteDataToDict(ePyObject &dict, eDVBFrontendParametersSatellite &fe void PutTerrestrialDataToDict(ePyObject &dict, eDVBFrontendParametersTerrestrial &feparm) { PutToDict(dict, "type", "Terrestrial"); - PutToDict(dict, "frequency", feparm.frequency); + PutToDictAsStr(dict, "frequency", feparm.frequency); const char *tmp=0; switch (feparm.bandwidth) { @@ -273,8 +275,8 @@ void PutCableDataToDict(ePyObject &dict, eDVBFrontendParametersCable &feparm) { const char *tmp=0; PutToDict(dict, "type", "Cable"); - PutToDict(dict, "frequency", feparm.frequency); - PutToDict(dict, "symbolrate", feparm.symbol_rate); + PutToDictAsStr(dict, "frequency", feparm.frequency); + PutToDictAsStr(dict, "symbolrate", feparm.symbol_rate); switch (feparm.modulation) { case eDVBFrontendParametersCable::Modulation::QAM16: tmp="QAM16"; break; @@ -2040,8 +2042,6 @@ PyObject *eDVBServiceBase::getTransponderData(bool original) eDVBFrontendParametersSatellite osat; if (!feparm->getDVBS(osat)) { - void PutToDict(ePyObject &, const char*, long); - void PutToDict(ePyObject &, const char*, const char*); PutToDict(ret, "orbital_position", osat.orbital_position); const char *tmp = "UNKNOWN"; switch(osat.polarisation) @@ -3020,8 +3020,6 @@ RESULT eDVBServicePlay::stream(ePtr<iStreamableService> &ptr) return 0; } -extern void PutToDict(ePyObject &dict, const char*key, ePyObject item); // defined in dvb/frontend.cpp - PyObject *eDVBServicePlay::getStreamingData() { eDVBServicePMTHandler::program program; @@ -3036,7 +3034,7 @@ PyObject *eDVBServicePlay::getStreamingData() { uint8_t demux_id; if (!demux->getCADemuxID(demux_id)) - PutToDict(r, "demux", PyInt_FromLong(demux_id)); + PutToDict(r, "demux", demux_id); } return r; |