Changeset 16119

Timestamp:

May 28, 2012, 8:05:40 PM (14 years ago)

Author:

obi

Message:

fix

Location:

ipk/source.sh4/swapplayers_mediacenter_1.0/var/swap/extensions/MediaCenter

Files:

• MC_FileListCover.py (modified) (1 diff)
• MC_PictureViewer.py (modified) (3 diffs)
• MC_VideoPlayer.py (modified) (18 diffs)

ipk/source.sh4/swapplayers_mediacenter_1.0/var/swap/extensions/MediaCenter/MC_FileListCover.py

@@ -36 +36 @@
 from Components.Console import Console
 from Screens.InfoBarGenerics import InfoBarSeek, InfoBarAudioSelection, InfoBarCueSheetSupport, InfoBarNotifications, \
-        InfoBarShowHide, InfoBarServiceErrorPopupSupport, InfoBarSecondInfobar, \
-        InfoBarPVRState, InfoBarSimpleEventView, InfoBarServiceNotifications, InfoBarResolutionSelection, \
+        InfoBarShowHide, InfoBarServiceErrorPopupSupport, \
+        InfoBarPVRState, InfoBarSimpleEventView, InfoBarServiceNotifications, \
         InfoBarMoviePlayerSummarySupport, InfoBarSubtitleSupport, InfoBarTeletextPlugin
 import os

ipk/source.sh4/swapplayers_mediacenter_1.0/var/swap/extensions/MediaCenter/MC_PictureViewer.py

@@ -4 +4 @@
 from Screens.ServiceInfo import ServiceInfoList, ServiceInfoListEntry
 from Screens.InfoBarGenerics import InfoBarSeek, InfoBarAudioSelection, InfoBarCueSheetSupport, InfoBarNotifications, \
-        InfoBarShowHide, InfoBarServiceErrorPopupSupport, InfoBarSecondInfobar, \
-        InfoBarPVRState, InfoBarSimpleEventView, InfoBarServiceNotifications, InfoBarResolutionSelection, \
+        InfoBarShowHide, InfoBarServiceErrorPopupSupport, \
+        InfoBarPVRState, InfoBarSimpleEventView, InfoBarServiceNotifications, \
         InfoBarMoviePlayerSummarySupport, InfoBarSubtitleSupport, InfoBarTeletextPlugin
+
 from Components.AVSwitch import AVSwitch
 from Components.ActionMap import ActionMap, NumberActionMap, HelpableActionMap
@@ -38 +39 @@
 from Plugins.Extensions.Aafpanel.plugin import command
 from __init__ import _
+
+print "hallllllllllllllllllllllllllllllllllllllllllllllllo"
+checkpli = False
+if os.path.isfile("/etc/.enigma2-pli") is True:
+        checkpli = True
+
+try:
+        from Screens.InfoBarGenerics import InfoBarSecondInfobar, InfoBarResolutionSelection
+except:
+        pass
 
 lastpath = "/"
@@ -1425 +1436 @@
                 self.close()
 
-class MC_PicView(Screen, InfoBarAspectSelection, InfoBarResolutionSelection):
+
+if checkpli is True:
+        input = Screen, InfoBarAspectSelection
+else:
+        input = Screen, InfoBarAspectSelection, InfoBarResolutionSelection
+
+class MC_PicView(input):
         def __init__(self, session, filelist, pindex, path, startslide):
                 self.debug = command('cat /var/etc/autostart/start-config | grep debug | cut -d = -f2')

ipk/source.sh4/swapplayers_mediacenter_1.0/var/swap/extensions/MediaCenter/MC_VideoPlayer.py

@@ -24 +24 @@
 from Screens.HelpMenu import HelpableScreen
 from Screens.InfoBarGenerics import InfoBarSeek, InfoBarAudioSelection, InfoBarCueSheetSupport, InfoBarNotifications, \
-        InfoBarShowHide, InfoBarServiceErrorPopupSupport, InfoBarSecondInfobar, \
-        InfoBarPVRState, InfoBarSimpleEventView, InfoBarServiceNotifications, InfoBarResolutionSelection, \
+        InfoBarShowHide, InfoBarServiceErrorPopupSupport, \
+        InfoBarPVRState, InfoBarSimpleEventView, InfoBarServiceNotifications, \
         InfoBarMoviePlayerSummarySupport, InfoBarSubtitleSupport, InfoBarTeletextPlugin
+
 from Screens.Screen import Screen
 from Screens.ServiceInfo import ServiceInfoList, ServiceInfoListEntry
@@ -46 +47 @@
 
 from Components.Harddisk import harddiskmanager
+
+checkpli = False
+if os.path.isfile("/etc/.enigma2-pli") is True:
+        checkpli = True
+
+try:
+        from Screens.InfoBarGenerics import InfoBarSecondInfobar, InfoBarResolutionSelection
+except:
+        pass
 
 T_INDEX = 0
@@ -2755 +2765 @@
                 self.session.open(NetworkAdapterSelection)
 
-class MoviePlayerObi(InfoBarShowHide, \
-                InfoBarSeek, InfoBarAudioSelection, HelpableScreen, InfoBarNotifications, InfoBarAspectSelection, InfoBarSecondInfobar,
-                InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, InfoBarSimpleEventView, InfoBarResolutionSelection,
-                InfoBarMoviePlayerSummarySupport, InfoBarSubtitleSupport, Screen, InfoBarTeletextPlugin,
-                InfoBarServiceErrorPopupSupport):
+if checkpli is True:
+        input = (InfoBarShowHide, InfoBarSeek, InfoBarAudioSelection, HelpableScreen, InfoBarNotifications, InfoBarAspectSelection, InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, InfoBarSimpleEventView, InfoBarMoviePlayerSummarySupport, InfoBarSubtitleSupport, Screen, InfoBarTeletextPlugin, InfoBarServiceErrorPopupSupport)
+else:
+        input = (InfoBarShowHide, InfoBarSeek, InfoBarAudioSelection, HelpableScreen, InfoBarNotifications, InfoBarAspectSelection, InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, InfoBarSimpleEventView, InfoBarMoviePlayerSummarySupport, InfoBarSubtitleSupport, Screen, InfoBarTeletextPlugin, InfoBarServiceErrorPopupSupport, InfoBarResolutionSelection, InfoBarSecondInfobar)
+
+class MoviePlayerObi(input):
         ENABLE_RESUME_SUPPORT = True
         ALLOW_SUSPEND = True
-
+        
         def __init__(self, session, service, showFileInfo, playlist):
                 Screen.__init__(self, session)
@@ -2768 +2779 @@
                 InfoBarAspectSelection.__init__(self)
                 InfoBarAudioSelection.__init__(self)
-                InfoBarSecondInfobar.__init__(self)
+                if checkpli is True:
+                        InfoBarSecondInfobar.__init__(self)
+                
                 InfoBarSeek.__init__(self, actionmap = "MediaCenterSeekActions")
                 self.debug = command('cat /var/etc/autostart/start-config | grep debug | cut -d = -f2')
-
+        
                 config.plugins.mc_playing.Enabled = ConfigYesNo(default=True)
-
+        
                 self["actions"] = HelpableActionMap(self, "MoviePlayerActions",
                         {
                                 "leavePlayer": (self.leavePlayer, _("leave movie player..."))
                         })
-
+        
                 self["MediaPlayerActions"] = HelpableActionMap(self, "MediaPlayerActions",
                         {
@@ -2798 +2811 @@
                                 "ok": (self.change_ratio, "Change Ratio old"),
                         }, -2)
-
+        
                 for x in HelpableScreen, InfoBarShowHide, \
                                 InfoBarSeek, \
@@ -2810 +2823 @@
                 self.returning = False
                 self.playlist = playlist
-
+        
         def showPlaylist(self):
                 if self.debug != "off":
                         print "[MC_VideoPlayer] showPlaylist playlist leng (%s)" % (len(self.playlist))
-
+        
                 print "[MC_VideoPlayer] showPlaylist playlist leng (%s)" % (len(self.playlist))
-
+        
                 if len(self.playlist) > 1:
                         if len(self.playlist.getServiceRefList()) and len(self.playlist) > 1 and self.seekstate[3] == '>':
@@ -2845 +2858 @@
                 else:
                         self.setSeekState(self.SEEK_STATE_PLAY)
-
+        
                         if self.debug != "off":
                                 print "[MC_VideoPlayer] showPlaylist  skipped singel play"
-
-
+        
+        
         def nextMarkOrEntry(self):
                 if self.debug != "off":
@@ -2865 +2878 @@
                         if self.debug != "off":
                                 print "[MC_VideoPlayer] nextMarkOrEntry  skipped singel play"
-
+        
         def previousMarkOrEntry(self):
                 if self.debug != "off":
@@ -2881 +2894 @@
                         if self.debug != "off":
                                 print "[MC_VideoPlayer] previousMarkOrEntry  skipped singel play"
-
+        
         def leavePlayer(self):
                 self.is_closing = True
@@ -2901 +2914 @@
                                 config.av.threedmode.save()
                         self.session.nav.stopService()
-
+        
                         if self.playlist != []:
                                 self.playlist.clear()
-
+        
                         evfd.getInstance().vfd_write_string("MEDIACENTER")
                         os.system("vfdctl -play")
@@ -2911 +2924 @@
                 elif answer == "restart":
                         self.doSeek(0)
-
+        
         def doEofInternal(self, playing):
                 if self.debug != "off":
@@ -2919 +2932 @@
                                 print "[MC_VideoPlayer] set autoSleep %s min" % (config.plugins.mc_vp_autoSleep.delay.getValue())
                         self.session.nav.SleepTimer.setSleepTime(config.plugins.mc_vp_autoSleep.delay.getValue())
-#               else:                                                                                                                   ### FIX ME ! Dimmer.Timer gives a GS here (not an attribute) !#######
-#                       self.DimmerTimer.start(config.plugins.mc_all.dimmer_delay.getValue() * 1000, True)
-
+        #               else:                                                                                                                   ### FIX ME ! Dimmer.Timer gives a GS here (not an attribute) !#######
+        #                       self.DimmerTimer.start(config.plugins.mc_all.dimmer_delay.getValue() * 1000, True)
+        
                 print "len(self.playlist)", len(self.playlist)
-
+        
                 if ( len(self.playlist) > 0 ):
                         print "[MC_VideoPlayer] stop playlist"
@@ -2931 +2944 @@
                                         print "[MC_VideoPlayer] stop autoSleep %s min" % (config.plugins.mc_vp_autoSleep.delay.getValue())
                                 self.session.nav.SleepTimer.clear()
-
+        
                 self.session.nav.playService(None)
-
+        
                 self.is_closing = True
                 evfd.getInstance().vfd_write_string("MEDIACENTER")
@@ -2939 +2952 @@
                 
                 self.close(1)
-
+        
         def subtitleSelection(self):
                 if self.debug != "off":
@@ -2945 +2958 @@
                 from Screens.AudioSelection import SubtitleSelection
                 self.session.open(SubtitleSelection, self)
-
+        
         def audioSelection(self):
                 if self.debug != "off":
@@ -2951 +2964 @@
                 from Screens.AudioSelection import AudioSelection
                 self.session.openWithCallback(self.audioSelected, AudioSelection, infobar=self)         
-
+        
         def videoSelection(self):
                 if self.debug != "off":
                         print "[MC_VideoPlayer] start videoSelection"
-#               from Screens.InfoBarGenerics import InfoBarAudioSelection
-#               from Screens.AudioSelection import AudioSelection
-
-                
-#               self.session.open(InfoBarAudioSelection.aspectSelection)        
-
-#               from Screens.AudioSelection import AudioSelection
-#               self.session.openWithCallback(self.aspectSelection, AudioSelection)             
+        #               from Screens.InfoBarGenerics import InfoBarAudioSelection
+        #               from Screens.AudioSelection import AudioSelection
+        
+                
+        #               self.session.open(InfoBarAudioSelection.aspectSelection)        
+        
+        #               from Screens.AudioSelection import AudioSelection
+        #               self.session.openWithCallback(self.aspectSelection, AudioSelection)             
                 
                 from Screens.InfoBarGenerics import InfoBarAudioSelection
-#               self.aspectSelection = aspectSelection
+        #               self.aspectSelection = aspectSelection
                 self.session.open(self.aspectSelection)
-#               self.session.open(aspectSelection)              
-
+        #               self.session.open(aspectSelection)              
+        
         def sleepTimer(self):
                 from Screens.SleepTimerEdit import SleepTimerEdit
                 self.session.open(SleepTimerEdit)
-
+        
         def videoTune(self):
                 if os_path.isfile("/usr/lib/enigma2/python/Plugins/Extensions/Aafpanel/plugin.pyc") is True:
@@ -2980 +2993 @@
                         except:
                                 pass
-
+        
         def change_ratio(self):
                 if self.debug != "off":
@@ -3018 +3031 @@
                         eAVSwitch.getInstance().setAspectRatio(2)
                         self.session.open(MC_MessageBox, 'BESTFIT', MC_MessageBox.TYPE_WARNING, timeout=2)
+