From: Felix Domke Date: Thu, 12 Feb 2009 16:01:16 +0000 (+0100) Subject: Merge branch 'master' of /home/tmbinc/enigma2-git into tmbinc/FixTimingBugs X-Git-Url: http://code.vuplus.com/gitweb/?a=commitdiff_plain;h=2728b4ae124c0cde02d5a55a6ee52c19e4c2b822;hp=99ac184fdce7f1469851ed79dfb9a481c786ec23;p=vuplus_dvbapp Merge branch 'master' of /home/tmbinc/enigma2-git into tmbinc/FixTimingBugs --- diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py index baa9e5f..9b28bd8 100644 --- a/lib/python/Screens/InfoBar.py +++ b/lib/python/Screens/InfoBar.py @@ -126,7 +126,7 @@ class MoviePlayer(InfoBarBase, InfoBarShowHide, \ InfoBarSeek, InfoBarShowMovies, InfoBarAudioSelection, HelpableScreen, InfoBarNotifications, InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, InfoBarSimpleEventView, InfoBarMoviePlayerSummarySupport, InfoBarSubtitleSupport, Screen, InfoBarTeletextPlugin, - InfoBarServiceErrorPopupSupport, InfobarExtensions): + InfoBarServiceErrorPopupSupport, InfoBarExtensions): ENABLE_RESUME_SUPPORT = True ALLOW_SUSPEND = True @@ -144,7 +144,7 @@ class MoviePlayer(InfoBarBase, InfoBarShowHide, \ InfoBarAudioSelection, InfoBarNotifications, InfoBarSimpleEventView, \ InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, \ InfoBarMoviePlayerSummarySupport, InfoBarSubtitleSupport, \ - InfoBarTeletextPlugin, InfoBarServiceErrorPopupSupport, InfobarExtensions: + InfoBarTeletextPlugin, InfoBarServiceErrorPopupSupport, InfoBarExtensions: x.__init__(self) self.lastservice = self.session.nav.getCurrentlyPlayingServiceReference()