git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Screens/-{LanguageSelection.py, NetworkSetup.py, RdsDisplay.py, VirtualKeyBoard.py...
[enigma2.git]
/
lib
/
python
/
Screens
/
PictureInPicture.py
diff --git
a/lib/python/Screens/PictureInPicture.py
b/lib/python/Screens/PictureInPicture.py
index c89ca22953a697f10262191e554d4843d0e58412..e49eb36e65b788039b1f76b9fd276b7ef3233ddd 100644
(file)
--- a/
lib/python/Screens/PictureInPicture.py
+++ b/
lib/python/Screens/PictureInPicture.py
@@
-1,14
+1,19
@@
from Screens.Screen import Screen
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
from Components.VideoWindow import VideoWindow
from Components.config import config, ConfigPosition
+pip_config_initialized = False
+
class PictureInPicture(Screen):
def __init__(self, session):
class PictureInPicture(Screen):
def __init__(self, session):
+ global pip_config_initialized
Screen.__init__(self, session)
self["video"] = VideoWindow()
self.currentService = None
Screen.__init__(self, session)
self["video"] = VideoWindow()
self.currentService = None
- config.av.pip = ConfigPosition(default=[-1, -1, -1, -1], args = (719, 567, 720, 568))
+ 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.append(self.LayoutFinished)
def LayoutFinished(self):
@@
-26,30
+31,35
@@
class PictureInPicture(Screen):
config.av.pip.value[1] = y
config.av.pip.save()
self.instance.move(ePoint(x, y))
config.av.pip.value[1] = y
config.av.pip.save()
self.instance.move(ePoint(x, y))
-
+
def resize(self, w, 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 resize(self, w, 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 getPosition(self):
return ((self.instance.position().x(), self.instance.position().y()))
-
+
def getSize(self):
return (self.instance.size().width(), self.instance.size().height())
def getSize(self):
return (self.instance.size().width(), self.instance.size().height())
-
+
def playService(self, service):
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:
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
def getCurrentService(self):
return self.currentService
-
+