code.vuplus.com Git - vuplus_openvuplus_3.0/blob - meta-bsp/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_remove_pvr_action.patch

   1 diff --git a/RecordTimer.py b/RecordTimer.py
   2 index 763ee8ca3..6f7acfa18 100755
   3 --- a/RecordTimer.py
   4 +++ b/RecordTimer.py
   5 @@ -4,6 +4,7 @@ from enigma import eEPGCache, getBestPlayableServiceReference, \
   6  from Components.config import config
   7  from Components.UsageConfig import defaultMoviePath
   8  from Components.TimerSanityCheck import TimerSanityCheck
   9 +from Components.SystemInfo import SystemInfo
  10
  11  from Screens.MessageBox import MessageBox
  12  import Screens.Standby
  13 @@ -135,7 +136,10 @@ class RecordTimerEntry(timer.TimerEntry, object):
  14                 self.timer = None
  15                 self.__record_service = None
  16                 self.start_prepare = 0
  17 -               self.justplay = justplay
  18 +               if SystemInfo["PVRSupport"]:
  19 +                       self.justplay = justplay
  20 +               else:
  21 +                       self.justplay = True
  22                 self.afterEvent = afterEvent
  23                 self.dirname = dirname
  24                 self.dirnameHadToFallback = False
  25 @@ -460,7 +464,10 @@ def createTimer(xml):
  26         description = xml.get("description").encode("utf-8")
  27         repeated = xml.get("repeated").encode("utf-8")
  28         disabled = long(xml.get("disabled") or "0")
  29 -       justplay = long(xml.get("justplay") or "0")
  30 +       if SystemInfo["PVRSupport"]:
  31 +               justplay = long(xml.get("justplay") or "0")
  32 +       else:
  33 +               justplay = long("1")
  34         afterevent = str(xml.get("afterevent") or "nothing")
  35         afterevent = {
  36                 "nothing": AFTEREVENT.NONE,
  37 @@ -658,7 +665,10 @@ class RecordTimer(timer.Timer):
  38                         if timer.tags is not None:
  39                                 list.append(' tags="' + str(stringToXML(' '.join(timer.tags))) + '"')
  40                         list.append(' disabled="' + str(int(timer.disabled)) + '"')
  41 -                       list.append(' justplay="' + str(int(timer.justplay)) + '"')
  42 +                       if SystemInfo["PVRSupport"]:
  43 +                               list.append(' justplay="' + str(int(timer.justplay)) + '"')
  44 +                       else:
  45 +                               list.append(' justplay="1"')
  46                         list.append('>\n')
  47
  48                         if config.recording.debug.value:
  49 diff --git a/data/menu.xml b/data/menu.xml
  50 index a71c0367c..0340a8ce9 100755
  51 --- a/data/menu.xml
  52 +++ b/data/menu.xml
  53 @@ -71,7 +71,7 @@
  54                                         <item level="1" text="Device Setup..." entryID="device_setup"><screen module="NetworkSetup" screen="NetworkAdapterSelection"/></item>
  55                                         <item level="1" text="Nameserver Setup..." entryID="dns_setup"><screen module="NetworkSetup" screen="NameserverSetup"/></item>
  56                                 </menu>-->
  57 -                               <item level="2" text="Recording paths" entryId="RecordPaths"><screen module="RecordPaths" screen="RecordPathsSettings" /></item>
  58 +                               <item level="2" text="Recording paths" entryId="RecordPaths" requires="PVRSupport"><screen module="RecordPaths" screen="RecordPathsSettings" /></item>
  59                         </menu>
  60                         <item weight="10" level="1" text="Common Interface" entryID="ci_setup" requires="CommonInterface"><screen module="Ci" screen="CiSelection" /></item>
  61                         <item weight="15" level="0" text="Parental control" entryID="parental_setup"><screen module="ParentalControlSetup" screen="ParentalControlSetup" /></item>
  62 diff --git a/data/setup.xml b/data/setup.xml
  63 index 8e42c578c..99b0a92d6 100755
  64 --- a/data/setup.xml
  65 +++ b/data/setup.xml
  66 @@ -22,11 +22,11 @@
  67                 </setup>
  68                 <setup key="usage" title="Customize">
  69                         <item level="0" text="Setup Mode">config.usage.setup_level</item>
  70 -                       <item level="1" text="Recordings always have priority">config.recording.asktozap</item>
  71 -                       <item level="0" text="Margin before record (minutes)">config.recording.margin_before</item>
  72 -                       <item level="0" text="Margin after record">config.recording.margin_after</item>
  73 -                       <item level="0" text="Show blinking clock in display during recording">config.usage.blinking_display_clock_during_recording</item>
  74 -                       <item level="2" text="Show Message when Recording starts">config.usage.show_message_when_recording_starts</item>
  75 +                       <item level="1" text="Recordings always have priority" requires="PVRSupport">config.recording.asktozap</item>
  76 +                       <item level="0" text="Margin before record (minutes)" requires="PVRSupport">config.recording.margin_before</item>
  77 +                       <item level="0" text="Margin after record" requires="PVRSupport">config.recording.margin_after</item>
  78 +                       <item level="0" text="Show blinking clock in display during recording" requires="PVRSupport">config.usage.blinking_display_clock_during_recording</item>
  79 +                       <item level="2" text="Show Message when Recording starts" requires="PVRSupport">config.usage.show_message_when_recording_starts</item>
  80                         <item level="2" text="Load Length of Movies in Movielist">config.usage.load_length_of_movies_in_moviellist</item>
  81                         <item level="1" text="Show positioner movement">config.usage.showdish</item>
  82                         <item level="1" text="Enable multiple bouquets">config.usage.multibouquet</item>
  83 diff --git a/lib/python/Components/SystemInfo.py b/lib/python/Components/SystemInfo.py
  84 index 5b01c4cbe..205a68e38 100644
  85 --- a/lib/python/Components/SystemInfo.py
  86 +++ b/lib/python/Components/SystemInfo.py
  87 @@ -35,4 +35,4 @@ SystemInfo["ScrambledPlayback"] = HardwareInfo().get_vu_device_name() in ("solo4
  88  SystemInfo["FastChannelChange"] =  fileExists("/proc/stb/frontend/fbc/fcc")
  89  SystemInfo["MiniTV"] = fileExists("/proc/stb/lcd/live_enable")
  90  SystemInfo["DisableUsbRecord"] = HardwareInfo().get_vu_device_name() in ("solo4k", "uno4kse", "zero4k")
  91 -
  92 +SystemInfo["PVRSupport"] = HardwareInfo().get_vu_device_name() not in ["solose", "zero", "uno4k"]
  93 diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
  94 index 7e30af7b8..c91927265 100755
  95 --- a/lib/python/Screens/InfoBarGenerics.py
  96 +++ b/lib/python/Screens/InfoBarGenerics.py
  97 @@ -235,7 +235,7 @@ class InfoBarNumberZap:
  98                         else:
  99                                 self.servicelist.recallPrevService()
 100                 else:
 101 -                       if self.has_key("TimeshiftActions") and not self.timeshift_enabled:
 102 +                       if not (self.has_key("TimeshiftActions") and self.timeshift_enabled):
 103                                 self.session.openWithCallback(self.numberEntered, NumberZap, number)
 104
 105         def numberEntered(self, retval):
 106 @@ -1201,11 +1201,12 @@ class InfoBarShowMovies:
 107
 108  class InfoBarTimeshift:
 109         def __init__(self):
 110 -               self["TimeshiftActions"] = HelpableActionMap(self, "InfobarTimeshiftActions",
 111 -                       {
 112 -                               "timeshiftStart": (self.startTimeshift, _("start timeshift")),  # the "yellow key"
 113 -                               "timeshiftStop": (self.stopTimeshift, _("stop timeshift"))      # currently undefined :), probably 'TV'
 114 -                       }, prio=1)
 115 +               if SystemInfo["PVRSupport"]:
 116 +                       self["TimeshiftActions"] = HelpableActionMap(self, "InfobarTimeshiftActions",
 117 +                               {
 118 +                                       "timeshiftStart": (self.startTimeshift, _("start timeshift")),  # the "yellow key"
 119 +                                       "timeshiftStop": (self.stopTimeshift, _("stop timeshift"))      # currently undefined :), probably 'TV'
 120 +                               }, prio=1)
 121                 self["TimeshiftActivateActions"] = ActionMap(["InfobarTimeshiftActivateActions"],
 122                         {
 123                                 "timeshiftActivateEnd": self.activateTimeshiftEnd, # something like "rewind key"
 124 @@ -1534,10 +1535,11 @@ class InfoBarInstantRecord:
 125         """Instant Record - handles the instantRecord action in order to
 126         start/stop instant records"""
 127         def __init__(self):
 128 -               self["InstantRecordActions"] = HelpableActionMap(self, "InfobarInstantRecord",
 129 -                       {
 130 -                               "instantRecord": (self.instantRecord, _("Instant Record...")),
 131 -                       })
 132 +               if SystemInfo["PVRSupport"]:
 133 +                       self["InstantRecordActions"] = HelpableActionMap(self, "InfobarInstantRecord",
 134 +                               {
 135 +                                       "instantRecord": (self.instantRecord, _("Instant Record...")),
 136 +                               })
 137                 self.recording = []
 138
 139         def stopCurrentRecording(self, entry = -1):
 140 diff --git a/lib/python/Screens/TimerEntry.py b/lib/python/Screens/TimerEntry.py
 141 index c3e71c775..5ee9e414b 100644
 142 --- a/lib/python/Screens/TimerEntry.py
 143 +++ b/lib/python/Screens/TimerEntry.py
 144 @@ -94,7 +94,12 @@ class TimerEntry(Screen, ConfigListScreen):
 145                                 weekday = (int(strftime("%w", localtime(self.timer.begin))) - 1) % 7
 146                                 day[weekday] = 1
 147
 148 -                       self.timerentry_justplay = ConfigSelection(choices = [("zap", _("zap")), ("record", _("record"))], default = {0: "record", 1: "zap"}[justplay])
 149 +                       timer_choices = [("zap", _("zap"))]
 150 +                       default = "zap"
 151 +                       if SystemInfo["PVRSupport"]:
 152 +                               timer_choices.append(("record", _("record")))
 153 +                               default = {0: "record", 1: "zap"}[justplay]
 154 +                       self.timerentry_justplay = ConfigSelection(choices = timer_choices, default = default)
 155                         if SystemInfo["DeepstandbySupport"]:
 156                                 shutdownString = _("go to standby")
 157                         else: