Support Uno4k/Ultimo4k

[vuplus_openvuplus_3.0] / meta-bsp / recipes-vuplus / enigma2 / enigma2 / enigma2_vuplus_remove_pvr_action.patch

diff --git a/meta-bsp/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_remove_pvr_action.patch b/meta-bsp/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_remove_pvr_action.patch
index f142ad5..460098a 100644 (file)
--- a/meta-bsp/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_remove_pvr_action.patch
+++ b/meta-bsp/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_remove_pvr_action.patch
@@ -47,10 +47,10 @@ index d3ccd75..838b18a 100755
                        
                        if config.recording.debug.value:
 diff --git a/data/menu.xml b/data/menu.xml
-index 03e582c..ea225d6 100755
+index 5c8cbb2..ed0b415 100755
 --- a/data/menu.xml
 +++ b/data/menu.xml
-@@ -70,7 +70,7 @@
+@@ -71,7 +71,7 @@
                                        <item level="1" text="Device Setup..." entryID="device_setup"><screen module="NetworkSetup" screen="NetworkAdapterSelection"/></item>
                                        <item level="1" text="Nameserver Setup..." entryID="dns_setup"><screen module="NetworkSetup" screen="NameserverSetup"/></item>
                                </menu>-->
@@ -60,7 +60,7 @@ index 03e582c..ea225d6 100755
                        <item weight="10" level="1" text="Common Interface" entryID="ci_setup" requires="CommonInterface"><screen module="Ci" screen="CiSelection" /></item>
                        <item weight="15" level="0" text="Parental control" entryID="parental_setup"><screen module="ParentalControlSetup" screen="ParentalControlSetup" /></item>
 diff --git a/data/setup.xml b/data/setup.xml
-index 442fe13..e1e10dc 100755
+index 5ce6b62..9892f34 100755
 --- a/data/setup.xml
 +++ b/data/setup.xml
 @@ -22,11 +22,11 @@
@@ -81,27 +81,30 @@ index 442fe13..e1e10dc 100755
                        <item level="1" text="Show positioner movement">config.usage.showdish</item>
                        <item level="1" text="Enable multiple bouquets">config.usage.multibouquet</item>
 diff --git a/lib/python/Components/SystemInfo.py b/lib/python/Components/SystemInfo.py
-index f9c4065..5817a49 100644
+old mode 100644
+new mode 100755
+index 67f2e75..9ecd94d
 --- a/lib/python/Components/SystemInfo.py
 +++ b/lib/python/Components/SystemInfo.py
 @@ -1,6 +1,6 @@
  from enigma import eDVBResourceManager
  from Tools.Directories import fileExists
 -from Tools.HardwareInfo import HardwareInfo
-+from Tools.HardwareInfo import HardwareInfo, HardwareInfoVu
++from Tools.HardwareInfo import HardwareInfo, HardwareInfo
  
  SystemInfo = { }
  
-@@ -29,3 +29,4 @@ SystemInfo["NumFrontpanelLEDs"] = countFrontpanelLEDs()
- SystemInfo["FrontpanelDisplay"] = fileExists("/dev/dbox/oled0") or fileExists("/dev/dbox/lcd0")
- SystemInfo["FrontpanelDisplayGrayscale"] = fileExists("/dev/dbox/oled0")
+@@ -31,4 +31,5 @@ SystemInfo["FrontpanelDisplayGrayscale"] = fileExists("/dev/dbox/oled0")
  SystemInfo["DeepstandbySupport"] = HardwareInfo().get_device_name() != "dm800"
-+SystemInfo["PVRSupport"] = HardwareInfoVu().get_device_name() not in ["solose", "zero"]
+ SystemInfo["HdmiInSupport"] = HardwareInfo().get_vu_device_name() == "ultimo4k"
+ SystemInfo["WOWLSupport"] = HardwareInfo().get_vu_device_name() == "ultimo4k"
++SystemInfo["PVRSupport"] = HardwareInfo().get_vu_device_name() not in ["solose", "zero", "uno4k"]
+ 
 diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
-index 80cc196..d635eac 100755
+index b5bd06d..bc2b8a9 100755
 --- a/lib/python/Screens/InfoBarGenerics.py
 +++ b/lib/python/Screens/InfoBarGenerics.py
-@@ -233,7 +233,7 @@ class InfoBarNumberZap:
+@@ -235,7 +235,7 @@ class InfoBarNumberZap:
                        else:
                                self.servicelist.recallPrevService()
                else:
@@ -110,7 +113,7 @@ index 80cc196..d635eac 100755
                                self.session.openWithCallback(self.numberEntered, NumberZap, number)
  
        def numberEntered(self, retval):
-@@ -1181,11 +1181,12 @@ class InfoBarShowMovies:
+@@ -1185,11 +1185,12 @@ class InfoBarShowMovies:
  
  class InfoBarTimeshift:
        def __init__(self):
@@ -128,7 +131,7 @@ index 80cc196..d635eac 100755
                self["TimeshiftActivateActions"] = ActionMap(["InfobarTimeshiftActivateActions"],
                        {
                                "timeshiftActivateEnd": self.activateTimeshiftEnd, # something like "rewind key"
-@@ -1501,10 +1502,11 @@ class InfoBarInstantRecord:
+@@ -1509,10 +1510,11 @@ class InfoBarInstantRecord:
        """Instant Record - handles the instantRecord action in order to
        start/stop instant records"""
        def __init__(self):
@@ -162,34 +165,3 @@ index 9885e70..1d40547 100644
                        if SystemInfo["DeepstandbySupport"]:
                                shutdownString = _("go to deep standby")
                        else:
-diff --git a/lib/python/Tools/HardwareInfo.py b/lib/python/Tools/HardwareInfo.py
-index e72d291..a1188c1 100644
---- a/lib/python/Tools/HardwareInfo.py
-+++ b/lib/python/Tools/HardwareInfo.py
-@@ -32,3 +32,26 @@ class HardwareInfo:
- 
-       def get_device_name(self):
-               return HardwareInfo.device_name
-+
-+class HardwareInfoVu:
-+      device_name = None
-+
-+      def __init__(self):
-+              if HardwareInfoVu.device_name is not None:
-+                      return
-+
-+              HardwareInfoVu.device_name = "unknown"
-+              HardwareInfoVu.vendor_name = "unknown"
-+              try:
-+                      file = open("/proc/stb/info/vumodel", "r")
-+                      HardwareInfoVu.device_name = file.readline().strip()
-+                      file.close()
-+                      HardwareInfoVu.vendor_name = "vuplus"
-+              except:
-+                      pass
-+
-+      def get_device_name(self):
-+              return HardwareInfoVu.device_name
-+
-+      def get_vendor_name(self):
-+              return HardwareInfoVu.vendor_name