Changeset 3952

Timestamp:

Sep 13, 2010, 4:28:40 PM (16 years ago)

Author:

civer

Message:

[IPK /Mediaplayer (flash and Swap) ]

• fixed GS when pressing 2x "i" in MoviePlayer
• added resolution screen on green button...

Location:

ipk/source

Files:

• players_mediaplayer_1_0/usr/lib/enigma2/python/Plugins/Extensions/MediaPlayer/plugin.py (modified) (7 diffs)
• swapplayers_mediaplayer_1_0/var/swap/extensions/MediaPlayer/plugin.py (modified) (7 diffs)

ipk/source/players_mediaplayer_1_0/usr/lib/enigma2/python/Plugins/Extensions/MediaPlayer/plugin.py

@@ -9 +9 @@
 from Screens.ChoiceBox import ChoiceBox
 from Screens.InfoBarGenerics import InfoBarSeek, InfoBarAudioSelection, InfoBarCueSheetSupport, InfoBarNotifications, \
-        InfoBarShowHide, InfoBarServiceErrorPopupSupport, \
-        InfoBarPVRState, InfoBarSimpleEventView, InfoBarServiceNotifications, \
+        InfoBarShowHide, InfoBarServiceErrorPopupSupport, InfoBarAspectSelection, InfoBarSecondInfobar, \
+        InfoBarPVRState, InfoBarSimpleEventView, InfoBarServiceNotifications, InfoBarResolutionSelection, \
         InfoBarMoviePlayerSummarySupport, InfoBarSubtitleSupport, InfoBarTeletextPlugin
 from Screens.LocationBox import LocationBox
@@ -23 +23 @@
 from Components.AVSwitch import AVSwitch
 from Components.Harddisk import harddiskmanager
-from Components.config import config
+from Components.config import config, ConfigSubsection, ConfigYesNo
 from Tools.Directories import fileExists, pathExists, resolveFilename, SCOPE_CONFIG, SCOPE_PLAYLIST, SCOPE_SKIN_IMAGE
 from settings import MediaPlayerSettings
 from Plugins.SystemPlugins.Hotplug.plugin import hotplugNotifier
 import random
+
+config.plugins.mediaplayer = ConfigSubsection()
+config.plugins.mediaplayer.Enabled = ConfigYesNo(default=False)
 
 class MyPlayList(PlayList):
@@ -106 +109 @@
                 self.oldService = self.session.nav.getCurrentlyPlayingServiceReference()
                 self.session.nav.stopService()
+                config.plugins.mediaplayer.Enabled = ConfigYesNo(default=True)
 
                 self.playlistparsers = {}
@@ -269 +273 @@
                         hotplugNotifier.remove(self.hotplugCB)
                         del self["coverArt"].picload
+                        config.plugins.mediaplayer.Enabled = ConfigYesNo(default=True)
                         self.close()
 
@@ -1000 +1005 @@
 
 class MoviePlayer(InfoBarShowHide, \
-                InfoBarSeek, InfoBarAudioSelection, HelpableScreen, InfoBarNotifications,
-                InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, InfoBarSimpleEventView,
+                InfoBarSeek, InfoBarAudioSelection, HelpableScreen, InfoBarNotifications, InfoBarAspectSelection, InfoBarSecondInfobar,
+                InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, InfoBarSimpleEventView, InfoBarResolutionSelection,
                 InfoBarMoviePlayerSummarySupport, InfoBarSubtitleSupport, Screen, InfoBarTeletextPlugin,
                 InfoBarServiceErrorPopupSupport):
@@ -1010 +1015 @@
         def __init__(self, session, service):
                 Screen.__init__(self, session)
+                InfoBarSubtitleSupport.__init__(self)
+                InfoBarAspectSelection.__init__(self)
+                InfoBarAudioSelection.__init__(self)
+                InfoBarSecondInfobar.__init__(self)
                 
                 self["actions"] = HelpableActionMap(self, "MoviePlayerActions",
@@ -1025 +1034 @@
                 self["ColorActions"] = HelpableActionMap(self, "ColorActions", 
                         {
+                                "blue": (self.sleepTimer, _("Sleep Timer")),
                                 "blue": (self.sleepTimer, _("Sleep Timer")),
                         })

ipk/source/swapplayers_mediaplayer_1_0/var/swap/extensions/MediaPlayer/plugin.py

@@ -9 +9 @@
 from Screens.ChoiceBox import ChoiceBox
 from Screens.InfoBarGenerics import InfoBarSeek, InfoBarAudioSelection, InfoBarCueSheetSupport, InfoBarNotifications, \
-        InfoBarShowHide, InfoBarServiceErrorPopupSupport, \
-        InfoBarPVRState, InfoBarSimpleEventView, InfoBarServiceNotifications, \
+        InfoBarShowHide, InfoBarServiceErrorPopupSupport, InfoBarAspectSelection, InfoBarSecondInfobar, \
+        InfoBarPVRState, InfoBarSimpleEventView, InfoBarServiceNotifications, InfoBarResolutionSelection, \
         InfoBarMoviePlayerSummarySupport, InfoBarSubtitleSupport, InfoBarTeletextPlugin
 from Screens.LocationBox import LocationBox
@@ -23 +23 @@
 from Components.AVSwitch import AVSwitch
 from Components.Harddisk import harddiskmanager
-from Components.config import config
+from Components.config import config, ConfigSubsection, ConfigYesNo
 from Tools.Directories import fileExists, pathExists, resolveFilename, SCOPE_CONFIG, SCOPE_PLAYLIST, SCOPE_SKIN_IMAGE
 from settings import MediaPlayerSettings
 from Plugins.SystemPlugins.Hotplug.plugin import hotplugNotifier
 import random
+
+config.plugins.mediaplayer = ConfigSubsection()
+config.plugins.mediaplayer.Enabled = ConfigYesNo(default=False)
 
 class MyPlayList(PlayList):
@@ -106 +109 @@
                 self.oldService = self.session.nav.getCurrentlyPlayingServiceReference()
                 self.session.nav.stopService()
+                config.plugins.mediaplayer.Enabled = ConfigYesNo(default=True)
 
                 self.playlistparsers = {}
@@ -269 +273 @@
                         hotplugNotifier.remove(self.hotplugCB)
                         del self["coverArt"].picload
+                        config.plugins.mediaplayer.Enabled = ConfigYesNo(default=True)
                         self.close()
 
@@ -1000 +1005 @@
 
 class MoviePlayer(InfoBarShowHide, \
-                InfoBarSeek, InfoBarAudioSelection, HelpableScreen, InfoBarNotifications,
-                InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, InfoBarSimpleEventView,
+                InfoBarSeek, InfoBarAudioSelection, HelpableScreen, InfoBarNotifications, InfoBarAspectSelection, InfoBarSecondInfobar,
+                InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, InfoBarSimpleEventView, InfoBarResolutionSelection,
                 InfoBarMoviePlayerSummarySupport, InfoBarSubtitleSupport, Screen, InfoBarTeletextPlugin,
                 InfoBarServiceErrorPopupSupport):
@@ -1010 +1015 @@
         def __init__(self, session, service):
                 Screen.__init__(self, session)
+                InfoBarSubtitleSupport.__init__(self)
+                InfoBarAspectSelection.__init__(self)
+                InfoBarAudioSelection.__init__(self)
+                InfoBarSecondInfobar.__init__(self)
                 
                 self["actions"] = HelpableActionMap(self, "MoviePlayerActions",
@@ -1025 +1034 @@
                 self["ColorActions"] = HelpableActionMap(self, "ColorActions", 
                         {
+                                "blue": (self.sleepTimer, _("Sleep Timer")),
                                 "blue": (self.sleepTimer, _("Sleep Timer")),
                         })