code.vuplus.com Git - vuplus_openvuplus_3.0/blob - meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_mediaplayer.patch

   1 diff --git a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
   2 index 3fe66af..d366e6e 100755
   3 --- a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
   4 +++ b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
   5 @@ -7,7 +7,7 @@ from Screens.HelpMenu import HelpableScreen
   6  from Screens.MessageBox import MessageBox
   7  from Screens.InputBox import InputBox
   8  from Screens.ChoiceBox import ChoiceBox
   9 -from Screens.InfoBarGenerics import InfoBarSeek, InfoBarAudioSelection, InfoBarCueSheetSupport, InfoBarNotifications, InfoBarSubtitleSupport
  10 +from Screens.InfoBarGenerics import InfoBarSeek, InfoBarAudioSelection, InfoBarCueSheetSupport, InfoBarNotifications, InfoBarSubtitleSupport, InfoBarPVRState
  11  from Components.ActionMap import NumberActionMap, HelpableActionMap
  12  from Components.Label import Label
  13  from Components.Pixmap import Pixmap,MultiPixmap
  14 @@ -87,7 +87,7 @@ class MediaPixmap(Pixmap):
  15                 self.coverArtFileName = "/tmp/.id3coverart"
  16                 self.picload.startDecode(self.coverArtFileName)
  17
  18 -class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoBarCueSheetSupport, InfoBarNotifications, InfoBarSubtitleSupport, HelpableScreen):
  19 +class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoBarCueSheetSupport, InfoBarNotifications, InfoBarSubtitleSupport, InfoBarPVRState, HelpableScreen):
  20         ALLOW_SUSPEND = True
  21         ENABLE_RESUME_SUPPORT = True
  22
  23 @@ -199,6 +199,10 @@ class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoB
  24
  25                 InfoBarSeek.__init__(self, actionmap = "MediaPlayerSeekActions")
  26
  27 +               InfoBarPVRState.__init__(self)
  28 +               self.__hideTimer = eTimer()
  29 +               self.__hideTimer.callback.append(self.__hideMediaPlayerState)
  30 +
  31                 self.onClose.append(self.delMPTimer)
  32                 self.onClose.append(self.__onClose)
  33
  34 @@ -232,6 +236,14 @@ class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoB
  35                                 iPlayableService.evUser+13: self["coverArt"].embeddedCoverArt
  36                         })
  37
  38 +       def _mayShow(self):
  39 +               self.pvrStateDialog.show()
  40 +               if self.seekstate == self.SEEK_STATE_PLAY and not self.shown:
  41 +                       self.__hideTimer.start(5*1000, True)
  42 +
  43 +       def __hideMediaPlayerState(self):
  44 +               self.pvrStateDialog.hide()
  45 +
  46         def doNothing(self):
  47                 pass
  48
  49 @@ -759,6 +771,7 @@ class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoB
  50                         self.playlist.updateList()
  51                         if len(self.playlist) == 1:
  52                                 self.changeEntry(0)
  53 +                               self.switchToPlayList()
  54
  55         def addPlaylistParser(self, parser, extension):
  56                 self.playlistparsers[extension] = parser
  57 diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
  58 index 80cc196..7abb2ee 100755
  59 --- a/lib/python/Screens/InfoBarGenerics.py
  60 +++ b/lib/python/Screens/InfoBarGenerics.py
  61 @@ -957,14 +957,17 @@ class InfoBarSeek:
  62         def seekFwd(self):
  63                 seek = self.getSeek()
  64                 if seek and not (seek.isCurrentlySeekable() & 2):
  65 -                       if not self.fast_winding_hint_message_showed and (seek.isCurrentlySeekable() & 1):
  66 -                               self.session.open(MessageBox, _("No fast winding possible yet.. but you can use the number buttons to skip forward/backward!"), MessageBox.TYPE_INFO, timeout=10)
  67 -                               self.fast_winding_hint_message_showed = True
  68 -                               return
  69 -                       return 0 # trade as unhandled action
  70 +                       media = 1
  71 +               else:
  72 +                       media = 0
  73 +#                      if not self.fast_winding_hint_message_showed and (seek.isCurrentlySeekable() & 1):
  74 +#                              self.session.open(MessageBox, _("No fast winding possible yet.. but you can use the number buttons to skip forward/backward!"), MessageBox.TYPE_INFO, timeout=10)
  75 +#                              self.fast_winding_hint_message_showed = True
  76 +#                              return
  77 +#                      return 0 # trade as unhandled action
  78                 if self.seekstate == self.SEEK_STATE_PLAY:
  79                         self.setSeekState(self.makeStateForward(int(config.seek.enter_forward.value)))
  80 -               elif self.seekstate == self.SEEK_STATE_PAUSE:
  81 +               elif self.seekstate == self.SEEK_STATE_PAUSE and media==0:
  82                         if len(config.seek.speeds_slowmotion.value):
  83                                 self.setSeekState(self.makeStateSlowMotion(config.seek.speeds_slowmotion.value[-1]))
  84                         else:
  85 @@ -975,7 +978,11 @@ class InfoBarSeek:
  86                         speed = self.seekstate[1]
  87                         if self.seekstate[2]:
  88                                 speed /= self.seekstate[2]
  89 -                       speed = self.getHigher(speed, config.seek.speeds_forward.value) or config.seek.speeds_forward.value[-1]
  90 +                       if media==1 and speed == 8:
  91 +                               speed = 8
  92 +                               return 0 # trade as unhandled action
  93 +                       else:
  94 +                               speed = self.getHigher(speed, config.seek.speeds_forward.value) or config.seek.speeds_forward.value[-1]
  95                         self.setSeekState(self.makeStateForward(speed))
  96                 elif self.isStateBackward(self.seekstate):
  97                         speed = -self.seekstate[1]
  98 @@ -993,18 +1000,27 @@ class InfoBarSeek:
  99         def seekBack(self):
 100                 seek = self.getSeek()
 101                 if seek and not (seek.isCurrentlySeekable() & 2):
 102 -                       if not self.fast_winding_hint_message_showed and (seek.isCurrentlySeekable() & 1):
 103 -                               self.session.open(MessageBox, _("No fast winding possible yet.. but you can use the number buttons to skip forward/backward!"), MessageBox.TYPE_INFO, timeout=10)
 104 +                       media = 1
 105 +               else:
 106 +                       media = 0
 107 +#                      if not self.fast_winding_hint_message_showed and (seek.isCurrentlySeekable() & 1):
 108 +#                              self.session.open(MessageBox, _("No fast winding possible yet.. but you can use the number buttons to skip forward/backward!"), MessageBox.TYPE_INFO, timeout=10)
 109 +#                              self.fast_winding_hint_message_showed = True
 110 +#                              return
 111 +#                      return 0 # trade as unhandled action
 112 +               seekstate = self.seekstate
 113 +               if seekstate == self.SEEK_STATE_PLAY and media==0:
 114 +                       self.setSeekState(self.makeStateBackward(int(config.seek.enter_backward.value)))
 115 +               elif seekstate == self.SEEK_STATE_PLAY and media ==1:
 116 +                       if not self.fast_winding_hint_message_showed:
 117 +                               self.session.open(MessageBox, _("No rewinding possible yet.. but you can use the number buttons to skip forward/backward!"), MessageBox.TYPE_INFO, timeout=10)
 118                                 self.fast_winding_hint_message_showed = True
 119                                 return
 120                         return 0 # trade as unhandled action
 121 -               seekstate = self.seekstate
 122 -               if seekstate == self.SEEK_STATE_PLAY:
 123 -                       self.setSeekState(self.makeStateBackward(int(config.seek.enter_backward.value)))
 124                 elif seekstate == self.SEEK_STATE_EOF:
 125                         self.setSeekState(self.makeStateBackward(int(config.seek.enter_backward.value)))
 126                         self.doSeekRelative(-6)
 127 -               elif seekstate == self.SEEK_STATE_PAUSE:
 128 +               elif seekstate == self.SEEK_STATE_PAUSE and media==0:
 129                         self.doSeekRelative(-1)
 130                 elif self.isStateForward(seekstate):
 131                         speed = seekstate[1]
 132