X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/5e57d6b68efa092a6a85fdee2c6904c6bd473905..cfeea5d7bda036654206eefdb2ae96b03bd31969:/lib/python/Screens/PictureInPicture.py

diff --git a/lib/python/Screens/PictureInPicture.py b/lib/python/Screens/PictureInPicture.py
index 20cdb236..e49eb36e 100644
--- a/lib/python/Screens/PictureInPicture.py
+++ b/lib/python/Screens/PictureInPicture.py
@@ -1,40 +1,65 @@
 from Screens.Screen import Screen
-from enigma import ePoint, eSize, eServiceCenter
-
+from enigma import ePoint, eSize, eServiceCenter, getBestPlayableServiceReference, eServiceReference
 from Components.VideoWindow import VideoWindow
+from Components.config import config, ConfigPosition
+
+pip_config_initialized = False
 
 class PictureInPicture(Screen):
 	def __init__(self, session):
+		global pip_config_initialized
 		Screen.__init__(self, session)
-		
 		self["video"] = VideoWindow()
 		self.currentService = None
+		if not pip_config_initialized:
+			config.av.pip = ConfigPosition(default=[-1, -1, -1, -1], args = (719, 567, 720, 568))
+			pip_config_initialized = True
+		self.onLayoutFinish.append(self.LayoutFinished)
+
+	def LayoutFinished(self):
+		self.onLayoutFinish.remove(self.LayoutFinished)
+		x = config.av.pip.value[0]
+		y = config.av.pip.value[1]
+		w = config.av.pip.value[2]
+		h = config.av.pip.value[3]
+		if x != -1 and y != -1 and w != -1 and h != -1:
+			self.move(x, y)
+			self.resize(w, h)
 
 	def move(self, x, y):
-		print "moving pip to", str(x) + ":" + str(y)
+		config.av.pip.value[0] = x
+		config.av.pip.value[1] = y
+		config.av.pip.save()
 		self.instance.move(ePoint(x, y))
-		
+
 	def resize(self, w, h):
-		print "resizing pip to", str(w) + "x" + str(h)
+		config.av.pip.value[2] = w
+		config.av.pip.value[3] = h
+		config.av.pip.save()
 		self.instance.resize(eSize(*(w, h)))
 		self["video"].instance.resize(eSize(*(w, h)))
-		
+
 	def getPosition(self):
 		return ((self.instance.position().x(), self.instance.position().y()))
-		
+
 	def getSize(self):
 		return (self.instance.size().width(), self.instance.size().height())
-		
+
 	def playService(self, service):
-		self.pipservice = eServiceCenter.getInstance().play(service)
-		if self.pipservice and not self.pipservice.setTarget(1):
-			self.pipservice.start()
-			self.currentService = service
-			return True
+		if service and (service.flags & eServiceReference.isGroup):
+			ref = getBestPlayableServiceReference(service, eServiceReference())
 		else:
-			self.pipservice = None
-			return False
-		
+			ref = service
+		if ref:
+			self.pipservice = eServiceCenter.getInstance().play(ref)
+			if self.pipservice and not self.pipservice.setTarget(1):
+				self.pipservice.start()
+				self.currentService = service
+				return True
+			else:
+				self.pipservice = None
+		return False
+
 	def getCurrentService(self):
 		return self.currentService
-	
+