X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FComponents%2FMediaPlayer.py;h=416b015d7d1c03b11ca1206f2a2dbc22de41d2c0;hp=44937fa3de825429e47ad5a3cd20c47f6461ec92;hb=5db2dc5c63948651b3e4b337d7057cd940ccc644;hpb=ed40f6f85c9c07c3c1224ae20601082c0309a631

diff --git a/lib/python/Components/MediaPlayer.py b/lib/python/Components/MediaPlayer.py
index 44937fa..416b015 100644
--- a/lib/python/Components/MediaPlayer.py
+++ b/lib/python/Components/MediaPlayer.py
@@ -1,12 +1,15 @@
-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, gFont, eServiceCenter
+
+from Tools.LoadPixmap import LoadPixmap
+
 
 STATE_PLAY = 0
 STATE_PAUSE = 1
@@ -15,11 +18,11 @@ STATE_REWIND = 3
 STATE_FORWARD = 4
 STATE_NONE = 5
 
-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"))
+PlayIcon = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "ico_mp_play.png"))
+PauseIcon = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "ico_mp_pause.png"))
+StopIcon = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "ico_mp_stop.png"))
+RewindIcon = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "ico_mp_rewind.png"))
+ForwardIcon = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "ico_mp_forward.png"))
 
 def PlaylistEntryComponent(serviceref, state):
 	res = [ serviceref ]
@@ -48,8 +51,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 +66,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 +112,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)