Index: /ipk/source/players_mediaplayer_1_0/usr/lib/enigma2/python/Plugins/Extensions/MediaPlayer/plugin.py
===================================================================
--- /ipk/source/players_mediaplayer_1_0/usr/lib/enigma2/python/Plugins/Extensions/MediaPlayer/plugin.py	(revision 3951)
+++ /ipk/source/players_mediaplayer_1_0/usr/lib/enigma2/python/Plugins/Extensions/MediaPlayer/plugin.py	(revision 3952)
@@ -9,6 +9,6 @@
 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,9 +23,12 @@
 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,4 +109,5 @@
 		self.oldService = self.session.nav.getCurrentlyPlayingServiceReference()
 		self.session.nav.stopService()
+		config.plugins.mediaplayer.Enabled = ConfigYesNo(default=True)
 
 		self.playlistparsers = {}
@@ -269,4 +273,5 @@
 			hotplugNotifier.remove(self.hotplugCB)
 			del self["coverArt"].picload
+			config.plugins.mediaplayer.Enabled = ConfigYesNo(default=True)
 			self.close()
 
@@ -1000,6 +1005,6 @@
 
 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,4 +1015,8 @@
 	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,4 +1034,5 @@
 		self["ColorActions"] = HelpableActionMap(self, "ColorActions", 
 			{
+				"blue": (self.sleepTimer, _("Sleep Timer")),
 				"blue": (self.sleepTimer, _("Sleep Timer")),
 			})
Index: /ipk/source/swapplayers_mediaplayer_1_0/var/swap/extensions/MediaPlayer/plugin.py
===================================================================
--- /ipk/source/swapplayers_mediaplayer_1_0/var/swap/extensions/MediaPlayer/plugin.py	(revision 3951)
+++ /ipk/source/swapplayers_mediaplayer_1_0/var/swap/extensions/MediaPlayer/plugin.py	(revision 3952)
@@ -9,6 +9,6 @@
 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,9 +23,12 @@
 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,4 +109,5 @@
 		self.oldService = self.session.nav.getCurrentlyPlayingServiceReference()
 		self.session.nav.stopService()
+		config.plugins.mediaplayer.Enabled = ConfigYesNo(default=True)
 
 		self.playlistparsers = {}
@@ -269,4 +273,5 @@
 			hotplugNotifier.remove(self.hotplugCB)
 			del self["coverArt"].picload
+			config.plugins.mediaplayer.Enabled = ConfigYesNo(default=True)
 			self.close()
 
@@ -1000,6 +1005,6 @@
 
 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,4 +1015,8 @@
 	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,4 +1034,5 @@
 		self["ColorActions"] = HelpableActionMap(self, "ColorActions", 
 			{
+				"blue": (self.sleepTimer, _("Sleep Timer")),
 				"blue": (self.sleepTimer, _("Sleep Timer")),
 			})