X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/1227e551c6adb84ab8b152112baa587c034b974c..855949a917ed8cf65397adc49872c99bdb2123c2:/lib/service/servicedvb.cpp diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp index 774e3f6b..238f838f 100644 --- a/lib/service/servicedvb.cpp +++ b/lib/service/servicedvb.cpp @@ -65,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) + " - "; } } } @@ -125,7 +116,7 @@ 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, "type", "Satellite"); PutToDict(dict, "frequency", feparm.frequency); PutToDict(dict, "symbolrate", feparm.symbol_rate); PutToDict(dict, "orbital position", feparm.orbital_position); @@ -192,7 +183,7 @@ void PutSatelliteDataToDict(ePyObject &dict, eDVBFrontendParametersSatellite &fe void PutTerrestrialDataToDict(ePyObject &dict, eDVBFrontendParametersTerrestrial &feparm) { - PutToDict(dict, "type", "terrestrial"); + PutToDict(dict, "type", "Terrestrial"); PutToDict(dict, "frequency", feparm.frequency); const char *tmp=0; switch (feparm.bandwidth) @@ -276,7 +267,7 @@ void PutTerrestrialDataToDict(ePyObject &dict, eDVBFrontendParametersTerrestrial void PutCableDataToDict(ePyObject &dict, eDVBFrontendParametersCable &feparm) { const char *tmp=0; - PutToDict(dict, "type", "cable"); + PutToDict(dict, "type", "Cable"); PutToDict(dict, "frequency", feparm.frequency); PutToDict(dict, "symbolrate", feparm.symbol_rate); switch (feparm.modulation) @@ -730,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 @@ -750,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); @@ -782,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()); } @@ -1049,6 +1065,7 @@ void eDVBServicePlay::serviceEvent(int event) } break; } + case eDVBServicePMTHandler::eventNoResources: case eDVBServicePMTHandler::eventNoPAT: case eDVBServicePMTHandler::eventNoPATEntry: case eDVBServicePMTHandler::eventNoPMT: @@ -1107,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; @@ -1128,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; } @@ -1172,7 +1193,7 @@ RESULT eDVBServicePlay::stop() if (!::stat(m_reference.path.c_str(), &s)) saveCuesheet(); } - + m_event((iPlayableService*)this, evStopped); return 0; } @@ -1865,7 +1886,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; } @@ -1980,6 +2001,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(), @@ -2014,6 +2040,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(); @@ -2037,17 +2064,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() @@ -2700,7 +2728,6 @@ void eDVBServicePlay::setPCMDelay(int delay) void eDVBServicePlay::video_event(struct iTSMPEGDecoder::videoEvent event) { - eDebug("!!!!!!!!!! Video Event type %d, aspect %d, %dx%d", event.type, event.aspect, event.width, event.height); memcpy(&m_videoEventData, &event, sizeof(iTSMPEGDecoder::videoEvent)); m_event((iPlayableService*)this, evVideoSizeChanged); }