Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[PictureInPicture] stream relay limit one service #3964

Closed
wants to merge 1 commit into from
Closed

[PictureInPicture] stream relay limit one service #3964

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 12 additions & 3 deletions lib/python/Screens/PictureInPicture.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from Screens.Screen import Screen
from Screens.Dish import Dishpip
from enigma import ePoint, eSize, eRect, eServiceCenter, getBestPlayableServiceReference, eServiceReference, eTimer
from enigma import ePoint, eSize, eRect, eServiceCenter, getBestPlayableServiceReference, eServiceReference, eTimer, eStreamServer
from Components.SystemInfo import BoxInfo
from Components.VideoWindow import VideoWindow
from Components.Sources.StreamService import StreamServiceList
Expand Down Expand Up @@ -61,6 +61,7 @@ def __init__(self, session):
self["video"] = VideoWindow()
self.pipActive = session.instantiateDialog(PictureInPictureZapping)
self.dishpipActive = session.instantiateDialog(Dishpip)
self.pipservice = None
self.currentService = None
self.currentServiceReference = None

Expand All @@ -83,6 +84,7 @@ def __init__(self, session):
def __del__(self):
if hasattr(self, "pipservice"):
del self.pipservice
self.pipservice = None
self.setExternalPiP(False)
self.setSizePosMainWindow()
if hasattr(self, "dishpipActive") and self.dishpipActive is not None:
Expand Down Expand Up @@ -192,9 +194,16 @@ def playService(self, service):
return False
from Screens.InfoBarGenerics import streamrelay
orig_ref = self.resolveAlternatePipService(service)
ref = streamrelay.streamrelayChecker(orig_ref)
ref = orig_ref and streamrelay.streamrelayChecker(orig_ref)
if ref:
if BoxInfo.getItem("CanNotDoSimultaneousTranscodeAndPIP") and StreamServiceList:
if orig_ref != ref and [stream for stream in eStreamServer.getInstance().getConnectedClients() if stream[0] == '127.0.0.1']:
self.pipservice = None
self.currentService = None
self.currentServiceReference = None
if not config.usage.hide_zap_errors.value:
AddPopup(text="PiP...\n" + _("'Stream relay' already enabled, limit - no PiP!"), type=MessageBox.TYPE_ERROR, timeout=5, id="ZapPipError")
return False
elif BoxInfo.getItem("CanNotDoSimultaneousTranscodeAndPIP") and StreamServiceList:
self.pipservice = None
self.currentService = None
self.currentServiceReference = None
Expand Down