dont show pip options in extension menu when no pip is available

diff --git a/lib/python/Components/SystemInfo.py b/lib/python/Components/SystemInfo.py
index a3b83fd99f3d8181a4687933c2f5041568916d59..f33a8552991fd2eed842ca7c7fa4d590556e54be 100644 (file)
--- a/lib/python/Components/SystemInfo.py
+++ b/lib/python/Components/SystemInfo.py
@@ -1 +1,10 @@
-SystemInfo = { }
\ No newline at end of file
+SystemInfo = { }
+
+#FIXMEE...
+def getNumVideoDecoders():
+       from Tools.Directories import fileExists
+       idx = 0
+       while fileExists("/dev/dvb/adapter0/video%d"%(idx), 'w'):
+               idx += 1
+
+SystemInfo["NumVideoDecoders"] = getNumVideoDecoders()

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index 3bc8a419b220f083203e3a05b188c3725fa0f4d8..66af357469c4cdd8c48a3dcb3781a6be9c7eadf3 100644 (file)
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -12,6 +12,7 @@ from Components.ServiceEventTracker import ServiceEventTracker
 from Components.Sources.Source import ObsoleteSource
 from Components.Sources.Boolean import Boolean
 from Components.config import config, ConfigBoolean, ConfigClock
 from Components.Sources.Source import ObsoleteSource
 from Components.Sources.Boolean import Boolean
 from Components.config import config, ConfigBoolean, ConfigClock

+from Components.SystemInfo import SystemInfo

 from EpgSelection import EPGSelection
 from Plugins.Plugin import PluginDescriptor
 
 from EpgSelection import EPGSelection
 from Plugins.Plugin import PluginDescriptor
 


@@ -1309,13 +1310,13 @@ class InfoBarSleepTimer:
 class InfoBarPiP:
        def __init__(self):
                self.session.pipshown = False
 class InfoBarPiP:
        def __init__(self):
                self.session.pipshown = False

-
-               self.addExtension((self.getShowHideName, self.showPiP, self.available), "blue")
-               self.addExtension((self.getMoveName, self.movePiP, self.pipShown), "green")
-               self.addExtension((self.getSwapName, self.swapPiP, self.pipShown), "yellow")
+               if SystemInfo.get("NumVideoDecoders", 1) > 1:
+                       self.addExtension((self.getShowHideName, self.showPiP, self.available), "blue")
+                       self.addExtension((self.getMoveName, self.movePiP, self.pipShown), "green")
+                       self.addExtension((self.getSwapName, self.swapPiP, self.pipShown), "yellow")

 
        def available(self):
 
        def available(self):

-               return True
+               return SystemInfo.get("NumVideoDecoders", 1) > 1

 
        def pipShown(self):
                return self.session.pipshown
 
        def pipShown(self):
                return self.session.pipshown

diff --git a/lib/python/Tools/Directories.py b/lib/python/Tools/Directories.py
index 0096f3f4426d90f29eb12c78dcc00571967fddbd..4cdb1d4285cd626189d10a581c02983d58e4ac3a 100644 (file)
--- a/lib/python/Tools/Directories.py
+++ b/lib/python/Tools/Directories.py
@@ -105,9 +105,9 @@ def createDir(path):
                ret = 1
        return ret
 
                ret = 1
        return ret
 

-def fileExists(f):
+def fileExists(f, mode='r'):

        try:
        try:

-               file = open(f)
+               file = open(f, mode)

        except IOError:
                exists = 0
        else:
        except IOError:
                exists = 0
        else: