From: Andreas Monzner Date: Sat, 6 May 2006 16:31:02 +0000 (+0000) Subject: remove no more needed c++ single epg list content class X-Git-Tag: 2.6.0~3477 X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/29f60fdaf6f0ff1dd112c9e0e913ec734b304bf1?hp=8acc9a009ec9412ab25acef4e02a27d4e9f905d9 remove no more needed c++ single epg list content class code cleanup in python epg classes get epg from parent service when epg is queried for a subservice(linkage service) --- diff --git a/lib/components/Makefile.am b/lib/components/Makefile.am index 70bd8b6b..e377ab85 100644 --- a/lib/components/Makefile.am +++ b/lib/components/Makefile.am @@ -3,5 +3,4 @@ INCLUDES = \ noinst_LIBRARIES = libenigma_components.a -libenigma_components_a_SOURCES = scan.cpp listboxepg.cpp file_eraser.cpp - \ No newline at end of file +libenigma_components_a_SOURCES = scan.cpp file_eraser.cpp diff --git a/lib/dvb/epgcache.cpp b/lib/dvb/epgcache.cpp index 975d46ac..ee61268c 100644 --- a/lib/dvb/epgcache.cpp +++ b/lib/dvb/epgcache.cpp @@ -1532,6 +1532,7 @@ PyObject *eEPGCache::lookupEvent(PyObject *list, PyObject *convertFunc) PyObject *item=PyList_GET_ITEM(list, listIt++); // borrowed reference! if (PyTuple_Check(item)) { + bool service_changed=false; int type=0; long event_id=-1; time_t stime=-1; @@ -1579,6 +1580,24 @@ PyObject *eEPGCache::lookupEvent(PyObject *list, PyObject *convertFunc) eDebug("service reference for epg query is not valid"); continue; } + + // redirect subservice querys to parent service + eServiceReferenceDVB &dvb_ref = (eServiceReferenceDVB&)ref; + if (dvb_ref.getParentTransportStreamID().get()) // linkage subservice + { + eServiceCenterPtr service_center; + if (!eServiceCenter::getPrivInstance(service_center)) + { + dvb_ref.setTransportStreamID( dvb_ref.getParentTransportStreamID() ); + dvb_ref.setServiceID( dvb_ref.getParentServiceID() ); + dvb_ref.setParentTransportStreamID(eTransportStreamID(0)); + dvb_ref.setParentServiceID(eServiceID(0)); + dvb_ref.name=""; + service = PyString_FromString(dvb_ref.toString().c_str()); + service_changed = true; + } + } + PyObject *service_name=NULL; if (must_get_service_name) { @@ -1628,6 +1647,8 @@ PyObject *eEPGCache::lookupEvent(PyObject *list, PyObject *convertFunc) if (ret) return ret; } + if (service_changed) + Py_DECREF(service); if (service_name) Py_DECREF(service_name); } diff --git a/lib/python/Components/EpgList.py b/lib/python/Components/EpgList.py index 10e56ae0..64fe87f4 100644 --- a/lib/python/Components/EpgList.py +++ b/lib/python/Components/EpgList.py @@ -22,8 +22,6 @@ RT_VALIGN_BOTTOM = 16 RT_WRAP = 32 -SINGLE_CPP = 0 - class Rect: def __init__(self, x, y, width, height): self.__left = x @@ -52,17 +50,14 @@ class EPGList(HTMLComponent, GUIComponent): self.onSelChanged.append(selChangedCB) GUIComponent.__init__(self) self.type=type - if type == EPG_TYPE_SINGLE and SINGLE_CPP > 0: - self.l = eListboxEPGContent() + self.l = eListboxPythonMultiContent() + if type == EPG_TYPE_SINGLE: + self.l.setBuildFunc(self.buildSingleEntry) + elif type == EPG_TYPE_MULTI: + self.l.setBuildFunc(self.buildMultiEntry) else: - self.l = eListboxPythonMultiContent() - if type == EPG_TYPE_SINGLE: - self.l.setBuildFunc(self.buildSingleEntry) - elif type == EPG_TYPE_MULTI: - self.l.setBuildFunc(self.buildMultiEntry) - else: - assert(type == EPG_TYPE_SIMILAR) - self.l.setBuildFunc(self.buildSimilarEntry) + assert(type == EPG_TYPE_SIMILAR) + self.l.setBuildFunc(self.buildSimilarEntry) self.epgcache = eEPGCache.getInstance() def getEventFromId(self, service, eventid): @@ -72,37 +67,21 @@ class EPGList(HTMLComponent, GUIComponent): return event def getCurrentChangeCount(self): - if self.type == EPG_TYPE_SINGLE: - return 0 - return self.l.getCurrentSelection()[0] + if self.type == EPG_TYPE_MULTI: + return self.l.getCurrentSelection()[0] + return 0 def getCurrent(self): - if self.type == EPG_TYPE_SINGLE: - if SINGLE_CPP > 0: - evt = self.l.getCurrent() - else: - cur = self.l.getCurrentSelection() - if cur is None: - return cur - else: - evt = self.getEventFromId(self.service, cur[0]) - elif self.type == EPG_TYPE_MULTI: - tmp = self.l.getCurrentSelection() - if tmp is None: - return ( None, None ) - eventid = tmp[2] - service = ServiceReference(tmp[1]) - event = self.getEventFromId(service, eventid) - evt = ( event, service ) - else: - tmp = self.l.getCurrentSelection() - if tmp is None: - return ( None, None ) - eventid = tmp[1] - service = ServiceReference(tmp[0]) - event = self.getEventFromId(service, eventid) - evt = ( event, service ) - return evt + idx=0 + if self.type == EPG_TYPE_MULTI: + idx += 1 + tmp = self.l.getCurrentSelection() + if tmp is None: + return ( None, None ) + eventid = tmp[idx+1] + service = ServiceReference(tmp[idx]) + event = self.getEventFromId(service, eventid) + return ( event, service ) def moveUp(self): self.instance.moveSelection(self.instance.moveUp) @@ -132,38 +111,35 @@ class EPGList(HTMLComponent, GUIComponent): instance.setWrapAround(True) instance.selectionChanged.get().append(self.selectionChanged) instance.setContent(self.l) - if SINGLE_CPP > 0: - instance.setItemHeight(25) def recalcEntrySize(self): - if SINGLE_CPP == 0: - esize = self.l.getItemSize() - self.l.setFont(0, gFont("Regular", 22)) - self.l.setFont(1, gFont("Regular", 16)) - width = esize.width() - height = esize.height() - if self.type == EPG_TYPE_SINGLE: - self.weekday_rect = Rect(0, 0, width/20*2-10, height) - self.datetime_rect = Rect(width/20*2, 0, width/20*5-15, height) - self.descr_rect = Rect(width/20*7, 0, width/20*13, height) - elif self.type == EPG_TYPE_MULTI: - xpos = 0; - w = width/10*3; - self.service_rect = Rect(xpos, 0, w-10, height) - xpos += w; - w = width/10*2; - self.start_end_rect = Rect(xpos, 0, w-10, height) - self.progress_rect = Rect(xpos, 4, w-10, height-8) - xpos += w - w = width/10*5; - self.descr_rect = Rect(xpos, 0, width, height) - else: # EPG_TYPE_SIMILAR - self.weekday_rect = Rect(0, 0, width/20*2-10, height) - self.datetime_rect = Rect(width/20*2, 0, width/20*5-15, height) - self.service_rect = Rect(width/20*7, 0, width/20*13, height) + esize = self.l.getItemSize() + self.l.setFont(0, gFont("Regular", 22)) + self.l.setFont(1, gFont("Regular", 16)) + width = esize.width() + height = esize.height() + if self.type == EPG_TYPE_SINGLE: + self.weekday_rect = Rect(0, 0, width/20*2-10, height) + self.datetime_rect = Rect(width/20*2, 0, width/20*5-15, height) + self.descr_rect = Rect(width/20*7, 0, width/20*13, height) + elif self.type == EPG_TYPE_MULTI: + xpos = 0; + w = width/10*3; + self.service_rect = Rect(xpos, 0, w-10, height) + xpos += w; + w = width/10*2; + self.start_end_rect = Rect(xpos, 0, w-10, height) + self.progress_rect = Rect(xpos, 4, w-10, height-8) + xpos += w + w = width/10*5; + self.descr_rect = Rect(xpos, 0, width, height) + else: # EPG_TYPE_SIMILAR + self.weekday_rect = Rect(0, 0, width/20*2-10, height) + self.datetime_rect = Rect(width/20*2, 0, width/20*5-15, height) + self.service_rect = Rect(width/20*7, 0, width/20*13, height) - def buildSingleEntry(self, eventId, beginTime, duration, EventName): - rec=(self.timer.isInTimer(eventId, beginTime, duration, self.service) > ((duration/10)*8)) + def buildSingleEntry(self, service, eventId, beginTime, duration, EventName): + rec=(self.timer.isInTimer(eventId, beginTime, duration, service) > ((duration/10)*8)) r1=self.weekday_rect r2=self.datetime_rect r3=self.descr_rect @@ -272,12 +248,8 @@ class EPGList(HTMLComponent, GUIComponent): def fillSingleEPG(self, service): t = time() - if SINGLE_CPP > 0: - self.l.setRoot(service.ref) - else: - self.service = service - test = [ 'IBDT', (service.ref.toString(), 0, -1, -1) ] - self.l.setList(self.queryEPG(test)) + test = [ 'RIBDT', (service.ref.toString(), 0, -1, -1) ] + self.l.setList(self.queryEPG(test)) print time() - t self.selectionChanged() diff --git a/lib/python/Screens/EpgSelection.py b/lib/python/Screens/EpgSelection.py index ffbea9a0..0f057ac7 100644 --- a/lib/python/Screens/EpgSelection.py +++ b/lib/python/Screens/EpgSelection.py @@ -103,13 +103,11 @@ class EPGSelection(Screen): self.close(self.closeRecursive) def infoKeyPressed(self): - if self.type == EPG_TYPE_MULTI or self.type == EPG_TYPE_SIMILAR: - cur = self["list"].getCurrent() - event = cur[0] - service = cur[1] - else: - event = self["list"].getCurrent() - service = self.currentService + cur = self["list"].getCurrent() + event = cur[0] + service = cur[1] + print "event", cur[0] + print "service", cur[1] if event is not None: if self.type != EPG_TYPE_SIMILAR: self.session.open(EventViewSimple, event, service, self.eventViewCallback, self.openSimilarList) @@ -126,15 +124,12 @@ class EPGSelection(Screen): #just used in multipeg def onCreate(self): l = self["list"] + l.recalcEntrySize() if self.type == EPG_TYPE_MULTI: - l.recalcEntrySize() l.fillMultiEPG(self.services, self.ask_time) elif self.type == EPG_TYPE_SINGLE: - if SINGLE_CPP == 0: - l.recalcEntrySize() l.fillSingleEPG(self.currentService) else: - l.recalcEntrySize() l.fillSimilarList(self.currentService, self.eventid) def eventViewCallback(self, setEvent, setService, val): @@ -145,14 +140,11 @@ class EPGSelection(Screen): elif val == +1: self.moveDown() cur = l.getCurrent() - if self.type == EPG_TYPE_SINGLE: - setEvent(cur) + if self.type == EPG_TYPE_MULTI and cur[0] is None and cur[1].ref != old[1].ref: + self.eventViewCallback(setEvent, setService, val) else: - if self.type == EPG_TYPE_MULTI and cur[0] is None and cur[1].ref != old[1].ref: - self.eventViewCallback(setEvent, setService, val) - else: - setService(cur[1]) - setEvent(cur[0]) + setService(cur[1]) + setEvent(cur[0]) def zapTo(self): # just used in multiepg if self.zapFunc and self["key_red"].getText() == "Zap": @@ -175,13 +167,9 @@ class EPGSelection(Screen): self["list"].updateMultiEPG(1) def timerAdd(self): - if self.type == EPG_TYPE_SINGLE: - event = self["list"].getCurrent() - serviceref = self.currentService - else: - cur = self["list"].getCurrent() - event = cur[0] - serviceref = cur[1] + cur = self["list"].getCurrent() + event = cur[0] + serviceref = cur[1] if event is None: return newEntry = RecordTimerEntry(serviceref, checkOldTimers = True, *parseEvent(event)) diff --git a/lib/python/enigma_python.i b/lib/python/enigma_python.i index e16270b5..04134636 100644 --- a/lib/python/enigma_python.i +++ b/lib/python/enigma_python.i @@ -67,7 +67,6 @@ is usually caused by not marking PSignals as immutable. #include #include #include -#include #include #include #include @@ -182,7 +181,6 @@ typedef long time_t; %include %include %include -%include %include %include %include