X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/ed40f6f85c9c07c3c1224ae20601082c0309a631..35f4d6b50c5e8c79e57dea6e9ad9403b5ab6fdd5:/lib/python/Components/MediaPlayer.py

diff --git a/lib/python/Components/MediaPlayer.py b/lib/python/Components/MediaPlayer.py
index 44937fa3..a728aef7 100644
--- a/lib/python/Components/MediaPlayer.py
+++ b/lib/python/Components/MediaPlayer.py
@@ -1,12 +1,12 @@
-from HTMLComponent import *
-from GUIComponent import *
+from HTMLComponent import HTMLComponent
+from GUIComponent import GUIComponent
 
 from MenuList import MenuList
 
 from Tools.Directories import SCOPE_SKIN_IMAGE, resolveFilename
 from os import path
 
-from enigma import eListboxPythonMultiContent, eListbox, RT_VALIGN_CENTER, loadPNG, gFont
+from enigma import eListboxPythonMultiContent, eListbox, RT_VALIGN_CENTER, loadPNG, gFont, eServiceCenter
 
 STATE_PLAY = 0
 STATE_PAUSE = 1
@@ -48,8 +48,10 @@ class PlayList(MenuList, HTMLComponent, GUIComponent):
 		self.list = []
 		self.l.setList(self.list)
 		self.l.setFont(0, gFont("Regular", 18))
+		self.l.setItemHeight(22)
 		self.currPlaying = -1
 		self.oldCurrPlaying = -1
+		self.serviceHandler = eServiceCenter.getInstance()
 	
 	def clear(self):
 		del self.list[:]
@@ -61,7 +63,6 @@ class PlayList(MenuList, HTMLComponent, GUIComponent):
 
 	def postWidgetCreate(self, instance):
 		instance.setContent(self.l)
-		instance.setItemHeight(22)
 
 	def getSelection(self):
 		return self.l.getCurrentSelection()[0]
@@ -108,12 +109,17 @@ class PlayList(MenuList, HTMLComponent, GUIComponent):
 		
 	def getCurrentIndex(self):
 		return self.currPlaying
+
+	def getCurrentEvent(self):
+		l = self.l.getCurrentSelection()
+		return l and self.serviceHandler.info(l[0]).getEvent(l[0])
+
+	def getCurrent(self):
+		l = self.l.getCurrentSelection()
+		return l and l[0]
 	
 	def getServiceRefList(self):
-		list = []
-		for x in self.list:
-			list.append(x[0])
-		return list
+		return [ x[0] for x in self.list ]
 	
 	def __len__(self):
 		return len(self.list)