Merge branch 'bug_274_disable_fast_winding_for_non_ts' into experimental
authorghost <andreas.monzner@multimedia-labs.de>
Thu, 5 Nov 2009 10:44:56 +0000 (11:44 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Thu, 5 Nov 2009 10:44:56 +0000 (11:44 +0100)
1  2 
lib/python/Screens/InfoBarGenerics.py
lib/service/servicemp3.cpp

@@@ -691,7 -690,10 +691,8 @@@ class InfoBarSeek
                                iPlayableService.evEOF: self.__evEOF,
                                iPlayableService.evSOF: self.__evSOF,
                        })
+               self.fast_winding_hint_message_showed = False
  
 -              self.minSpeedBackward = useSeekBackHack and 16 or 0
 -
                class InfoBarSeekActionMap(HelpableActionMap):
                        def __init__(self, screen, *args, **kwargs):
                                HelpableActionMap.__init__(self, screen, *args, **kwargs)
Simple merge