X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/eaba0ae47c605e932fc9a932ec6cd7928af15206..b9bda8a0d43be892f2e5d96ea45ba8d4b2fdae20:/lib/service/servicedvb.cpp diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp index 85961550..9d9f2d1f 100644 --- a/lib/service/servicedvb.cpp +++ b/lib/service/servicedvb.cpp @@ -40,6 +40,7 @@ public: RESULT getName(const eServiceReference &ref, std::string &name); int getLength(const eServiceReference &ref); int isPlayable(const eServiceReference &ref, const eServiceReference &ignore); + PyObject *getInfoObject(const eServiceReference &ref, int); }; DEFINE_REF(eStaticServiceDVBInformation); @@ -64,16 +65,7 @@ RESULT eStaticServiceDVBInformation::getName(const eServiceReference &ref, std:: if (!service_center->info(parent, service_info)) { if (!service_info->getName(parent, name)) - { - // just show short name - unsigned int pos = name.find("\xc2\x86"); - if ( pos != std::string::npos ) - name.erase(0, pos+2); - pos = name.find("\xc2\x87"); - if ( pos != std::string::npos ) - name.erase(pos); - name+=" - "; - } + name=buildShortName(name) + " - "; } } } @@ -95,7 +87,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; @@ -106,6 +98,275 @@ int eStaticServiceDVBInformation::isPlayable(const eServiceReference &ref, const return false; } +static void PutToDict(ePyObject &dict, const char*key, long value) +{ + ePyObject item = PyString_FromFormat("%d", value); + if (item) + { + if (PyDict_SetItemString(dict, key, item)) + eDebug("put %s to dict failed", key); + Py_DECREF(item); + } + else + eDebug("could not create PyObject for %s", key); +} + +extern void PutToDict(ePyObject &dict, const char*key, const char *value); + +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); + switch (feparm.inversion) + { + case eDVBFrontendParametersSatellite::Inversion::On: tmp="ON"; break; + case eDVBFrontendParametersSatellite::Inversion::Off: tmp="OFF"; break; + default: + case eDVBFrontendParametersSatellite::Inversion::Unknown: tmp="AUTO"; break; + } + PutToDict(dict, "inversion", tmp); + switch (feparm.fec) + { + case eDVBFrontendParametersSatellite::FEC::fNone: tmp="NONE"; break; + case eDVBFrontendParametersSatellite::FEC::f1_2: tmp="1/2"; break; + case eDVBFrontendParametersSatellite::FEC::f2_3: tmp="2/3"; break; + case eDVBFrontendParametersSatellite::FEC::f3_4: tmp="3/4"; break; + case eDVBFrontendParametersSatellite::FEC::f5_6: tmp="5/6"; break; + case eDVBFrontendParametersSatellite::FEC::f7_8: tmp="7/8"; break; + case eDVBFrontendParametersSatellite::FEC::f3_5: tmp="3/5"; break; + case eDVBFrontendParametersSatellite::FEC::f4_5: tmp="4/5"; break; + case eDVBFrontendParametersSatellite::FEC::f8_9: tmp="8/9"; break; + case eDVBFrontendParametersSatellite::FEC::f9_10: tmp="9/10"; break; + default: + case eDVBFrontendParametersSatellite::FEC::fAuto: tmp="AUTO"; break; + } + PutToDict(dict, "fec inner", tmp); + switch (feparm.modulation) + { + case eDVBFrontendParametersSatellite::Modulation::Auto: tmp="AUTO"; break; + case eDVBFrontendParametersSatellite::Modulation::QPSK: tmp="QPSK"; break; + case eDVBFrontendParametersSatellite::Modulation::M8PSK: tmp="8PSK"; break; + case eDVBFrontendParametersSatellite::Modulation::QAM_16: tmp="QAM16"; break; + } + PutToDict(dict, "modulation", tmp); + switch(feparm.polarisation) + { + case eDVBFrontendParametersSatellite::Polarisation::Horizontal: tmp="HORIZONTAL"; break; + case eDVBFrontendParametersSatellite::Polarisation::Vertical: tmp="VERTICAL"; break; + case eDVBFrontendParametersSatellite::Polarisation::CircularLeft: tmp="CIRCULAR LEFT"; break; + default: + case eDVBFrontendParametersSatellite::Polarisation::CircularRight: tmp="CIRCULAR RIGHT"; break; + } + PutToDict(dict, "polarization", tmp); + switch(feparm.system) + { + default: + case eDVBFrontendParametersSatellite::System::DVB_S: tmp="DVB-S"; break; + case eDVBFrontendParametersSatellite::System::DVB_S2: + switch(feparm.roll_off) + { + case eDVBFrontendParametersSatellite::RollOff::alpha_0_35: tmp="0.35"; break; + case eDVBFrontendParametersSatellite::RollOff::alpha_0_25: tmp="0.25"; break; + case eDVBFrontendParametersSatellite::RollOff::alpha_0_20: tmp="0.20"; break; + default: + case eDVBFrontendParametersSatellite::RollOff::alpha_auto: tmp="AUTO"; break; + } + PutToDict(dict, "roll off", tmp); + tmp="DVB-S2"; + break; + } + PutToDict(dict, "system", tmp); +} + +void PutTerrestrialDataToDict(ePyObject &dict, eDVBFrontendParametersTerrestrial &feparm) +{ + PutToDict(dict, "type", "Terrestrial"); + PutToDict(dict, "frequency", feparm.frequency); + 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; + default: + case eDVBFrontendParametersTerrestrial::Bandwidth::BwAuto: tmp="AUTO"; break; + } + PutToDict(dict, "bandwidth", tmp); + switch (feparm.code_rate_LP) + { + case eDVBFrontendParametersTerrestrial::FEC::f1_2: tmp="1/2"; break; + case eDVBFrontendParametersTerrestrial::FEC::f2_3: tmp="2/3"; break; + case eDVBFrontendParametersTerrestrial::FEC::f3_4: tmp="3/4"; break; + case eDVBFrontendParametersTerrestrial::FEC::f5_6: tmp="5/6"; break; + case eDVBFrontendParametersTerrestrial::FEC::f7_8: tmp="7/8"; break; + default: + case eDVBFrontendParametersTerrestrial::FEC::fAuto: tmp="AUTO"; break; + } + PutToDict(dict, "code rate lp", tmp); + switch (feparm.code_rate_HP) + { + case eDVBFrontendParametersTerrestrial::FEC::f1_2: tmp="1/2"; break; + case eDVBFrontendParametersTerrestrial::FEC::f2_3: tmp="2/3"; break; + case eDVBFrontendParametersTerrestrial::FEC::f3_4: tmp="3/4"; break; + case eDVBFrontendParametersTerrestrial::FEC::f5_6: tmp="5/6"; break; + case eDVBFrontendParametersTerrestrial::FEC::f7_8: tmp="7/8"; break; + default: + case eDVBFrontendParametersTerrestrial::FEC::fAuto: tmp="AUTO"; break; + } + PutToDict(dict, "code rate hp", tmp); + switch (feparm.modulation) + { + case eDVBFrontendParametersTerrestrial::Modulation::QPSK: tmp="QPSK"; break; + case eDVBFrontendParametersTerrestrial::Modulation::QAM16: tmp="QAM16"; break; + case eDVBFrontendParametersTerrestrial::Modulation::QAM64: tmp="QAM64"; break; + default: + case eDVBFrontendParametersTerrestrial::Modulation::Auto: tmp="AUTO"; break; + } + PutToDict(dict, "constellation", tmp); + switch (feparm.transmission_mode) + { + case eDVBFrontendParametersTerrestrial::TransmissionMode::TM2k: tmp="2k"; break; + case eDVBFrontendParametersTerrestrial::TransmissionMode::TM8k: tmp="8k"; break; + default: + case eDVBFrontendParametersTerrestrial::TransmissionMode::TMAuto: tmp="AUTO"; break; + } + PutToDict(dict, "transmission mode", tmp); + switch (feparm.guard_interval) + { + case eDVBFrontendParametersTerrestrial::GuardInterval::GI_1_32: tmp="1/32"; break; + case eDVBFrontendParametersTerrestrial::GuardInterval::GI_1_16: tmp="1/16"; break; + case eDVBFrontendParametersTerrestrial::GuardInterval::GI_1_8: tmp="1/8"; break; + case eDVBFrontendParametersTerrestrial::GuardInterval::GI_1_4: tmp="1/4"; break; + default: + case eDVBFrontendParametersTerrestrial::GuardInterval::GI_Auto: tmp="AUTO"; break; + } + PutToDict(dict, "guard interval", tmp); + switch (feparm.hierarchy) + { + case eDVBFrontendParametersTerrestrial::Hierarchy::HNone: tmp="NONE"; break; + case eDVBFrontendParametersTerrestrial::Hierarchy::H1: tmp="1"; break; + case eDVBFrontendParametersTerrestrial::Hierarchy::H2: tmp="2"; break; + case eDVBFrontendParametersTerrestrial::Hierarchy::H4: tmp="4"; break; + default: + case eDVBFrontendParametersTerrestrial::Hierarchy::HAuto: tmp="AUTO"; break; + } + PutToDict(dict, "hierarchy", tmp); + switch (feparm.inversion) + { + case eDVBFrontendParametersSatellite::Inversion::On: tmp="ON"; break; + case eDVBFrontendParametersSatellite::Inversion::Off: tmp="OFF"; break; + default: + case eDVBFrontendParametersSatellite::Inversion::Unknown: tmp="AUTO"; break; + } + PutToDict(dict, "inversion", tmp); +} + +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); + switch (feparm.modulation) + { + case eDVBFrontendParametersCable::Modulation::QAM16: tmp="QAM16"; break; + case eDVBFrontendParametersCable::Modulation::QAM32: tmp="QAM32"; break; + case eDVBFrontendParametersCable::Modulation::QAM64: tmp="QAM64"; break; + case eDVBFrontendParametersCable::Modulation::QAM128: tmp="QAM128"; break; + case eDVBFrontendParametersCable::Modulation::QAM256: tmp="QAM256"; break; + default: + case eDVBFrontendParametersCable::Modulation::Auto: tmp="AUTO"; break; + } + PutToDict(dict, "modulation", tmp); + switch (feparm.inversion) + { + case eDVBFrontendParametersCable::Inversion::On: tmp="ON"; break; + case eDVBFrontendParametersCable::Inversion::Off: tmp="OFF"; break; + default: + case eDVBFrontendParametersCable::Inversion::Unknown: tmp="AUTO"; break; + } + PutToDict(dict, "inversion", tmp); + switch (feparm.fec_inner) + { + case eDVBFrontendParametersCable::FEC::fNone: tmp="NONE"; break; + case eDVBFrontendParametersCable::FEC::f1_2: tmp="1/2"; break; + case eDVBFrontendParametersCable::FEC::f2_3: tmp="2/3"; break; + case eDVBFrontendParametersCable::FEC::f3_4: tmp="3/4"; break; + case eDVBFrontendParametersCable::FEC::f5_6: tmp="5/6"; break; + case eDVBFrontendParametersCable::FEC::f7_8: tmp="7/8"; break; + case eDVBFrontendParametersCable::FEC::f8_9: tmp="8/9"; break; + default: + case eDVBFrontendParametersCable::FEC::fAuto: tmp="AUTO"; break; + } + PutToDict(dict, "fec inner", tmp); +} + +PyObject *eStaticServiceDVBInformation::getInfoObject(const eServiceReference &r, int what) +{ + if (r.type == eServiceReference::idDVB) + { + const eServiceReferenceDVB &ref = (const eServiceReferenceDVB&)r; + switch(what) + { + case iServiceInformation::sTransponderData: + { + ePtr res; + if (!eDVBResourceManager::getInstance(res)) + { + ePtr db; + if (!res->getChannelList(db)) + { + eDVBChannelID chid; + ref.getChannelID(chid); + ePtr feparm; + if (!db->getChannelFrontendData(chid, feparm)) + { + int system; + if (!feparm->getSystem(system)) + { + ePyObject dict = PyDict_New(); + switch(system) + { + case iDVBFrontend::feSatellite: + { + eDVBFrontendParametersSatellite s; + feparm->getDVBS(s); + PutSatelliteDataToDict(dict, s); + break; + } + case iDVBFrontend::feTerrestrial: + { + eDVBFrontendParametersTerrestrial t; + feparm->getDVBT(t); + PutTerrestrialDataToDict(dict, t); + break; + } + case iDVBFrontend::feCable: + { + eDVBFrontendParametersCable c; + feparm->getDVBC(c); + PutCableDataToDict(dict, c); + break; + } + default: + eDebug("unknown frontend type %d", system); + Py_DECREF(dict); + break; + } + return dict; + } + } + } + } + } + } + } + Py_RETURN_NONE; +} + DEFINE_REF(eStaticServiceDVBBouquetInformation); RESULT eStaticServiceDVBBouquetInformation::getName(const eServiceReference &ref, std::string &name) @@ -460,6 +721,7 @@ RESULT eDVBServiceList::getContent(std::list &list, bool sort // S = Service Reference (as python string object .. same as ref.toString()) // C = Service Reference (as python string object .. same as ref.toCompareString()) // N = Service Name (as python string object) +// n = Short Service Name (short name brakets used) (as python string object) // when exactly one return value per service is selected in the format string, // then each value is directly a list entry // when more than one value is returned per service, then the list is a list of @@ -480,7 +742,7 @@ PyObject *eDVBServiceList::getContent(const char* format, bool sorted) ePtr sptr; eServiceCenterPtr service_center; - if (strchr(format, 'N')) + if (strchr(format, 'N') || strchr(format, 'n')) eServiceCenter::getPrivInstance(service_center); ret = PyList_New(services); @@ -512,6 +774,30 @@ PyObject *eDVBServiceList::getContent(const char* format, bool sorted) { std::string name; sptr->getName(ref, name); + + // filter short name brakets + unsigned int pos; + while((pos = name.find("\xc2\x86")) != std::string::npos) + name.erase(pos,2); + while((pos = name.find("\xc2\x87")) != std::string::npos) + name.erase(pos,2); + + if (name.length()) + tmp = PyString_FromString(name.c_str()); + } + } + if (!tmp) + tmp = PyString_FromString(""); + break; + case 'n': // short service name + if (service_center) + { + service_center->info(ref, sptr); + if (sptr) + { + std::string name; + sptr->getName(ref, name); + name = buildShortName(name); if (name.length()) tmp = PyString_FromString(name.c_str()); } @@ -714,6 +1000,7 @@ RESULT eServiceFactoryDVB::lookupService(ePtr &service, const eServ eDVBServicePlay::eDVBServicePlay(const eServiceReference &ref, eDVBService *service): m_reference(ref), m_dvb_service(service), m_have_video_pid(0), m_is_paused(0) { + memset(&m_videoEventData, 0, sizeof(struct iTSMPEGDecoder::videoEvent)); m_is_primary = 1; m_is_pvr = !m_reference.path.empty(); @@ -778,6 +1065,7 @@ void eDVBServicePlay::serviceEvent(int event) } break; } + case eDVBServicePMTHandler::eventNoResources: case eDVBServicePMTHandler::eventNoPAT: case eDVBServicePMTHandler::eventNoPATEntry: case eDVBServicePMTHandler::eventNoPMT: @@ -836,6 +1124,8 @@ RESULT eDVBServicePlay::start() to start recording from the data demux. */ if (m_is_pvr) m_cue = new eCueSheet(); + else + m_event(this, evStart); m_first_program_info = 1; eServiceReferenceDVB &service = (eServiceReferenceDVB&)m_reference; @@ -857,9 +1147,11 @@ RESULT eDVBServicePlay::start() } if (m_is_pvr) + { loadCuesheet(); + m_event(this, evStart); + } - m_event(this, evStart); m_event((iPlayableService*)this, evSeekableStatusChanged); return 0; } @@ -901,7 +1193,7 @@ RESULT eDVBServicePlay::stop() if (!::stat(m_reference.path.c_str(), &s)) saveCuesheet(); } - + m_event((iPlayableService*)this, evStopped); return 0; } @@ -1230,9 +1522,29 @@ int eDVBServicePlay::getInfo(int w) switch (w) { +#if HAVE_DVB_API_VERSION >= 3 + case sVideoHeight: + if (m_videoEventData.type != iTSMPEGDecoder::videoEvent::eventUnknown) + return m_videoEventData.height; + return -1; + case sVideoWidth: + if (m_videoEventData.type != iTSMPEGDecoder::videoEvent::eventUnknown) + return m_videoEventData.width; + return -1; +#else +#warning "FIXMEE implement sVideoHeight, sVideoWidth for old DVB API" +#endif case sAspect: - if (no_program_info) return -1; - if (!program.videoStreams.empty() && program.videoStreams[0].component_tag != -1) +#if HAVE_DVB_API_VERSION >= 3 + if (m_videoEventData.type != iTSMPEGDecoder::videoEvent::eventUnknown) + return m_videoEventData.aspect == VIDEO_FORMAT_4_3 ? 1 : 3; + else +#else +#warning "FIXMEE implement sAspect for old DVB API" +#endif + if (no_program_info) + return -1; + else if (!program.videoStreams.empty() && program.videoStreams[0].component_tag != -1) { ePtr evt; if (!m_event_handler.getEvent(evt, 0)) @@ -1310,6 +1622,8 @@ PyObject *eDVBServicePlay::getInfoObject(int w) { case sCAIDs: return m_service_handler.getCaIds(); + case sTransponderData: + return eStaticServiceDVBInformation().getInfoObject(m_reference, w); default: break; } @@ -1456,19 +1770,54 @@ int eDVBServiceBase::getFrontendInfo(int w) return fe->readFrontendData(w); } -PyObject *eDVBServiceBase::getFrontendData(bool original) +PyObject *eDVBServiceBase::getFrontendData() { - ePyObject ret; + ePyObject ret = PyDict_New(); + if (ret) + { + eUsePtr channel; + if(!m_service_handler.getChannel(channel)) + { + ePtr fe; + if(!channel->getFrontend(fe)) + fe->getFrontendData(ret); + } + } + else + Py_RETURN_NONE; + return ret; +} - eUsePtr channel; - if(!m_service_handler.getChannel(channel)) +PyObject *eDVBServiceBase::getFrontendStatus() +{ + ePyObject ret = PyDict_New(); + if (ret) + { + eUsePtr channel; + if(!m_service_handler.getChannel(channel)) + { + ePtr fe; + if(!channel->getFrontend(fe)) + fe->getFrontendStatus(ret); + } + } + else + Py_RETURN_NONE; + return ret; +} + +PyObject *eDVBServiceBase::getTransponderData(bool original) +{ + ePyObject ret = PyDict_New(); + if (ret) { - ePtr fe; - if(!channel->getFrontend(fe)) + eUsePtr channel; + if(!m_service_handler.getChannel(channel)) { - ret = fe->readTransponderData(original); - if (ret) + ePtr fe; + if(!channel->getFrontend(fe)) { + fe->getTransponderData(ret, original); ePtr feparm; channel->getCurrentFrontendParameters(feparm); if (feparm) @@ -1494,10 +1843,26 @@ PyObject *eDVBServiceBase::getFrontendData(bool original) } } } - if (!ret) + else + Py_RETURN_NONE; + return ret; +} + +PyObject *eDVBServiceBase::getAll(bool original) +{ + ePyObject ret = getTransponderData(original); + if (ret != Py_None) { - ret = Py_None; - Py_INCREF(ret); + eUsePtr channel; + if(!m_service_handler.getChannel(channel)) + { + ePtr fe; + if(!channel->getFrontend(fe)) + { + fe->getFrontendData(ret); + fe->getFrontendStatus(ret); + } + } } return ret; } @@ -1575,7 +1940,7 @@ RESULT eDVBServicePlay::stopTimeshift() close(m_timeshift_fd); eDebug("remove timeshift file"); - remove(m_timeshift_file.c_str()); + eBackgroundFileEraser::getInstance()->erase(m_timeshift_file.c_str()); return 0; } @@ -1690,6 +2055,11 @@ void eDVBServicePlay::updateTimeshiftPids() i != program.audioStreams.end(); ++i) pids_to_record.insert(i->pid); + for (std::vector::const_iterator + i(program.subtitleStreams.begin()); + i != program.subtitleStreams.end(); ++i) + pids_to_record.insert(i->pid); + std::set new_pids, obsolete_pids; std::set_difference(pids_to_record.begin(), pids_to_record.end(), @@ -1724,6 +2094,7 @@ void eDVBServicePlay::switchToLive() m_new_dvb_subtitle_page_connection = 0; m_new_subtitle_page_connection = 0; m_radiotext_updated_connection = 0; + m_video_event_connection = 0; /* free the timeshift service handler, we need the resources */ m_service_handler_timeshift.free(); @@ -1747,17 +2118,18 @@ void eDVBServicePlay::switchToTimeshift() m_new_subtitle_page_connection = 0; m_new_dvb_subtitle_page_connection = 0; m_radiotext_updated_connection = 0; + m_video_event_connection = 0; m_timeshift_active = 1; - m_event((iPlayableService*)this, evSeekableStatusChanged); - eServiceReferenceDVB r = (eServiceReferenceDVB&)m_reference; r.path = m_timeshift_file; m_cue = new eCueSheet(); m_service_handler_timeshift.tune(r, 1, m_cue); /* use the decoder demux for everything */ updateDecoder(); /* mainly to switch off PCR */ + + m_event((iPlayableService*)this, evSeekableStatusChanged); } void eDVBServicePlay::updateDecoder() @@ -1828,7 +2200,11 @@ void eDVBServicePlay::updateDecoder() { h.getDecodeDemux(m_decode_demux); if (m_decode_demux) + { m_decode_demux->getMPEGDecoder(m_decoder, m_is_primary); + if (m_decoder) + m_decoder->connectVideoEvent(slot(*this, &eDVBServicePlay::video_event), m_video_event_connection); + } if (m_cue) m_cue->setDecodingDemux(m_decode_demux, m_decoder); m_teletext_parser = new eDVBTeletextParser(m_decode_demux); @@ -1934,7 +2310,7 @@ void eDVBServicePlay::updateDecoder() m_dvb_service->setCacheEntry(eDVBService::cPCRPID, pcrpid); m_dvb_service->setCacheEntry(eDVBService::cTPID, tpid); } - } + } m_have_video_pid = (vpid > 0 && vpid < 0x2000); } @@ -2200,17 +2576,13 @@ PyObject *eDVBServicePlay::getCachedSubtitle() } } } - Py_INCREF(Py_None); - return Py_None; + Py_RETURN_NONE; } PyObject *eDVBServicePlay::getSubtitleList() { if (!m_teletext_parser) - { - Py_INCREF(Py_None); - return Py_None; - } + Py_RETURN_NONE; ePyObject l = PyList_New(0); std::set added_ttx_pages; @@ -2408,6 +2780,24 @@ void eDVBServicePlay::setPCMDelay(int delay) m_decoder->setPCMDelay(delay); } +void eDVBServicePlay::video_event(struct iTSMPEGDecoder::videoEvent event) +{ + memcpy(&m_videoEventData, &event, sizeof(iTSMPEGDecoder::videoEvent)); + m_event((iPlayableService*)this, evVideoSizeChanged); +} + 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");