X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/80099e8bcecb0679984f69e6ceb1a4ab81c85456..01056473cce2697c877d331eb8e99ffa850116ae:/lib/python/Components/MediaPlayer.py

diff --git a/lib/python/Components/MediaPlayer.py b/lib/python/Components/MediaPlayer.py
index 70a1dbbd..ec0000c9 100644
--- a/lib/python/Components/MediaPlayer.py
+++ b/lib/python/Components/MediaPlayer.py
@@ -3,19 +3,10 @@ from GUIComponent import *
 
 from MenuList import MenuList
 
-from Tools.Directories import *
-import os
+from Tools.Directories import SCOPE_SKIN_IMAGE, resolveFilename
+from os import path
 
-from enigma import *
-
-RT_HALIGN_LEFT = 0
-RT_HALIGN_RIGHT = 1
-RT_HALIGN_CENTER = 2
-RT_HALIGN_BLOCK = 4
-
-RT_VALIGN_TOP = 0
-RT_VALIGN_CENTER = 8
-RT_VALIGN_BOTTOM = 16
+from enigma import eListboxPythonMultiContent, eListbox, RT_VALIGN_CENTER, loadPNG, gFont, eServiceCenter
 
 STATE_PLAY = 0
 STATE_PAUSE = 1
@@ -24,15 +15,15 @@ STATE_REWIND = 3
 STATE_FORWARD = 4
 STATE_NONE = 5
 
-PlayIcon = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "play-small-fs8.png"))
-PauseIcon = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "pause-small-fs8.png"))
-StopIcon = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "stop-small-fs8.png"))
-RewindIcon = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "rewind-small-fs8.png"))
-ForwardIcon = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "forward-small-fs8.png"))
+PlayIcon = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "ico_mp_play.png"))
+PauseIcon = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "ico_mp_pause.png"))
+StopIcon = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "ico_mp_stop.png"))
+RewindIcon = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "ico_mp_rewind.png"))
+ForwardIcon = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "ico_mp_forward.png"))
 
 def PlaylistEntryComponent(serviceref, state):
 	res = [ serviceref ]
-	res.append((eListboxPythonMultiContent.TYPE_TEXT, 35, 0, 250, 32, 0, RT_VALIGN_CENTER, os.path.split(serviceref.getPath().split('/')[-1])[1]))
+	res.append((eListboxPythonMultiContent.TYPE_TEXT,25, 0, 470, 32, 0, RT_VALIGN_CENTER, path.split(serviceref.getPath().split('/')[-1])[1]))
 	png = None
 	if state == STATE_PLAY:
 		png = PlayIcon
@@ -46,31 +37,33 @@ def PlaylistEntryComponent(serviceref, state):
 		png = ForwardIcon
 
 	if png is not None:
-		res.append((eListboxPythonMultiContent.TYPE_PIXMAP, 0, 0, 33, 32, png))
+		res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, 5, 0, 16, 16, png))
     
 	return res
 
-class PlayList(HTMLComponent, GUIComponent, MenuList):
+class PlayList(MenuList, HTMLComponent, GUIComponent):
 	def __init__(self):
 		GUIComponent.__init__(self)
 		self.l = eListboxPythonMultiContent()
 		self.list = []
 		self.l.setList(self.list)
 		self.l.setFont(0, gFont("Regular", 18))
-		self.currPlaying = 0
+		self.l.setItemHeight(22)
+		self.currPlaying = -1
 		self.oldCurrPlaying = -1
+		self.serviceHandler = eServiceCenter.getInstance()
 	
 	def clear(self):
 		del self.list[:]
 		self.l.setList(self.list)
-		self.currPlaying = 0
+		self.currPlaying = -1
 		self.oldCurrPlaying = -1
 
-	def GUIcreate(self, parent):
-		self.instance = eListbox(parent)
-		self.instance.setContent(self.l)
-		self.instance.setItemHeight(32)
-	
+	GUI_WIDGET = eListbox
+
+	def postWidgetCreate(self, instance):
+		instance.setContent(self.l)
+
 	def getSelection(self):
 		return self.l.getCurrentSelection()[0]
 		
@@ -92,7 +85,8 @@ class PlayList(HTMLComponent, GUIComponent, MenuList):
 	def updateState(self, state):
 		if len(self.list) > self.oldCurrPlaying and self.oldCurrPlaying != -1:
 			self.list[self.oldCurrPlaying] = PlaylistEntryComponent(self.list[self.oldCurrPlaying][0], STATE_NONE)
-		self.list[self.currPlaying] = PlaylistEntryComponent(self.list[self.currPlaying][0], state)
+		if self.currPlaying != -1 and self.currPlaying < len(self.list):
+			self.list[self.currPlaying] = PlaylistEntryComponent(self.list[self.currPlaying][0], state)
 		self.updateList()
 
 	def playFile(self):
@@ -115,12 +109,17 @@ class PlayList(HTMLComponent, GUIComponent, MenuList):
 		
 	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)