From: Andreas Monzner Date: Fri, 15 Dec 2006 00:41:27 +0000 (+0000) Subject: small fix X-Git-Tag: 2.6.0~2589 X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/1227e551c6adb84ab8b152112baa587c034b974c small fix --- diff --git a/lib/dvb/idvb.h b/lib/dvb/idvb.h index 7ee50e8d..9e78153b 100644 --- a/lib/dvb/idvb.h +++ b/lib/dvb/idvb.h @@ -274,6 +274,7 @@ public: RESULT getName(const eServiceReference &ref, std::string &name); RESULT getEvent(const eServiceReference &ref, ePtr &ptr, time_t start_time); int isPlayable(const eServiceReference &ref, const eServiceReference &ignore); + PyObject *getInfoObject(const eServiceReference &ref, int); // implemented in lib/service/servicedvb.h /* for filtering: */ int checkFilter(const eServiceReferenceDVB &ref, const eDVBChannelQuery &query); diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp index 7a9eaab9..774e3f6b 100644 --- a/lib/service/servicedvb.cpp +++ b/lib/service/servicedvb.cpp @@ -96,7 +96,7 @@ int eStaticServiceDVBInformation::isPlayable(const eServiceReference &ref, const { ePtr res_mgr; if ( eDVBResourceManager::getInstance( res_mgr ) ) - eDebug("isPlayble... no res manager!!"); + eDebug("isPlayable... no res manager!!"); else { eDVBChannelID chid, chid_ignore; @@ -197,9 +197,9 @@ void PutTerrestrialDataToDict(ePyObject &dict, eDVBFrontendParametersTerrestrial const char *tmp=0; switch (feparm.bandwidth) { - case eDVBFrontendParametersTerrestrial::Bandwidth::Bw8MHz: tmp="8 Mhz"; break; - case eDVBFrontendParametersTerrestrial::Bandwidth::Bw7MHz: tmp="7 Mhz"; break; - case eDVBFrontendParametersTerrestrial::Bandwidth::Bw6MHz: tmp="6 Mhz"; break; + case eDVBFrontendParametersTerrestrial::Bandwidth::Bw8MHz: tmp="8 MHz"; break; + case eDVBFrontendParametersTerrestrial::Bandwidth::Bw7MHz: tmp="7 MHz"; break; + case eDVBFrontendParametersTerrestrial::Bandwidth::Bw6MHz: tmp="6 MHz"; break; default: case eDVBFrontendParametersTerrestrial::Bandwidth::BwAuto: tmp="AUTO"; break; } @@ -2707,4 +2707,16 @@ void eDVBServicePlay::video_event(struct iTSMPEGDecoder::videoEvent event) DEFINE_REF(eDVBServicePlay) +PyObject *eDVBService::getInfoObject(const eServiceReference &ref, int w) +{ + switch (w) + { + case iServiceInformation::sTransponderData: + return eStaticServiceDVBInformation().getInfoObject(ref, w); + default: + break; + } + return iStaticServiceInformation::getInfoObject(ref, w); +} + eAutoInitPtr init_eServiceFactoryDVB(eAutoInitNumbers::service+1, "eServiceFactoryDVB");