Merge branch 'master' of /home/tmbinc/enigma2-git

3 files changed, 89 insertions, 11 deletions

diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py
index bae8f7de..0ff4042b 100644
--- a/lib/python/Screens/ChannelSelection.py
+++ b/lib/python/Screens/ChannelSelection.py
@@ -317,11 +317,24 @@ class ChannelSelectionEPG:
 
 	def showEPGList(self):
 		ref=self.getCurrentSelection()
-		ptr=eEPGCache.getInstance()
-		if ptr.startTimeQuery(ref) != -1:
-			self.session.open(EPGSelection, ref)
-		else:
-			print 'no epg for service', ref.toString()
+		if ref:
+			self.savedService = ref
+			self.session.openWithCallback(self.SingleServiceEPGClosed, EPGSelection, ref, serviceChangeCB=self.changeServiceCB)
+
+	def SingleServiceEPGClosed(self, ret=False):
+		self.setCurrentSelection(self.savedService)
+
+	def changeServiceCB(self, direction, epg):
+		beg = self.getCurrentSelection()
+		while True:
+			if direction > 0:
+				self.moveDown()
+			else:
+				self.moveUp()
+			cur = self.getCurrentSelection()
+			if cur == beg or not (cur.flags & eServiceReference.isMarker):
+				break
+		epg.setService(ServiceReference(self.getCurrentSelection()))
 
 class ChannelSelectionEdit:
 	def __init__(self):
diff --git a/lib/python/Screens/EpgSelection.py b/lib/python/Screens/EpgSelection.py
index ae96333e..d09ed004 100644
--- a/lib/python/Screens/EpgSelection.py
+++ b/lib/python/Screens/EpgSelection.py
@@ -25,12 +25,14 @@ class EPGSelection(Screen):
 	
 	ZAP = 1
 
-	def __init__(self, session, service, zapFunc=None, eventid=None, bouquetChangeCB=None):
+	def __init__(self, session, service, zapFunc=None, eventid=None, bouquetChangeCB=None, serviceChangeCB=None):
 		Screen.__init__(self, session)
 		self.bouquetChangeCB = bouquetChangeCB
+		self.serviceChangeCB = serviceChangeCB
 		self.ask_time = -1 #now
 		self["key_red"] = Button("")
 		self.closeRecursive = False
+		self.saved_title = None
 		if isinstance(service, str) and eventid != None:
 			self.type = EPG_TYPE_SIMILAR
 			self["key_yellow"] = Button()
@@ -80,11 +82,12 @@ class EPGSelection(Screen):
 				"info": self.infoKeyPressed,
 				"red": self.zapTo,
 				"input_date_time": self.enterDateTime,
-				"nextBouquet": self.nextBouquet,
-				"prevBouquet": self.prevBouquet
+				"nextBouquet": self.nextBouquet, # just used in multi epg yet
+				"prevBouquet": self.prevBouquet, # just used in multi epg yet
+				"nextService": self.nextService, # just used in single epg yet
+				"prevService": self.prevService, # just used in single epg yet
 			})
 		self["actions"].csel = self
-
 		self.onLayoutFinish.append(self.onCreate)
 
 	def nextBouquet(self):
@@ -95,6 +98,14 @@ class EPGSelection(Screen):
 		if self.bouquetChangeCB:
 			self.bouquetChangeCB(-1, self)
 
+	def nextService(self):
+		if self.serviceChangeCB:
+			self.serviceChangeCB(1, self)
+
+	def prevService(self):
+		if self.serviceChangeCB:
+			self.serviceChangeCB(-1, self)
+
 	def enterDateTime(self):
 		if self.type == EPG_TYPE_MULTI:
 			global mepg_config_initialized
@@ -129,6 +140,10 @@ class EPGSelection(Screen):
 		self.services = services
 		self.onCreate()
 
+	def setService(self, service):
+		self.currentService = service
+		self.onCreate()
+
 	#just used in multipeg
 	def onCreate(self):
 		l = self["list"]
@@ -137,7 +152,12 @@ class EPGSelection(Screen):
 			l.fillMultiEPG(self.services, self.ask_time)
 			l.moveToService(self.session.nav.getCurrentlyPlayingServiceReference())
 		elif self.type == EPG_TYPE_SINGLE:
-			l.fillSingleEPG(self.currentService)
+			service = self.currentService
+			if self.saved_title is None:
+				self.saved_title = self.instance.getTitle()
+			title = self.saved_title + ' - ' + service.getServiceName()
+			self.instance.setTitle(title)
+			l.fillSingleEPG(service)
 		else:
 			l.fillSimilarList(self.currentService, self.eventid)
 
diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index 71e08327..20a239a2 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -391,6 +391,32 @@ class InfoBarSimpleEventView:
 			epglist[1] = tmp
 			setEvent(epglist[0])
 
+class SimpleServicelist:
+	def __init__(self, services):
+		self.services = services
+		self.length = len(services)
+		self.current = 0
+
+	def selectService(self, service):
+		self.current = 0
+		while self.services[self.current].ref != service:
+			self.current += 1
+
+	def nextService(self):
+		if self.current+1 < self.length:
+			self.current += 1
+		else:
+			self.current = 0
+
+	def prevService(self):
+		if self.current-1 > -1:
+			self.current -= 1
+		else:
+			self.current = self.length - 1
+
+	def currentService(self):
+		return self.services[self.current]
+
 class InfoBarEPG:
 	""" EPG - Opens an EPG list when the showEPGList action fires """
 	def __init__(self):
@@ -487,9 +513,28 @@ class InfoBarEPG:
 		elif cnt == 1:
 			self.openBouquetEPG(bouquets[0][1], withCallback)
 
+	def changeServiceCB(self, direction, epg):
+		if self.serviceSel:
+			if direction > 0:
+				self.serviceSel.nextService()
+			else:
+				self.serviceSel.prevService()
+			epg.setService(self.serviceSel.currentService())
+
+	def SingleServiceEPGClosed(self, ret=False):
+		self.serviceSel = None
+
 	def openSingleServiceEPG(self):
 		ref=self.session.nav.getCurrentlyPlayingServiceReference()
-		self.session.open(EPGSelection, ref)
+		if ref:
+			if self.servicelist.getMutableList() is not None: # bouquet in channellist
+				current_path = self.servicelist.getRoot()
+				services = self.getBouquetServices(current_path)
+				self.serviceSel = SimpleServicelist(services)
+				self.serviceSel.selectService(ref)
+				self.session.openWithCallback(self.SingleServiceEPGClosed, EPGSelection, ref, serviceChangeCB = self.changeServiceCB)
+			else:
+				self.session.open(EPGSelection, ref)
 
 	def showEventInfoPlugins(self):
 		list = [(p.name, boundFunction(self.runPlugin, p)) for p in plugins.getPlugins(where = PluginDescriptor.WHERE_EVENTINFO)]