From: acid-burn <acid-burn@opendreambox.org>
Date: Fri, 11 Feb 2011 12:32:34 +0000 (+0100)
Subject: Merge remote branch 'origin/acid-burn/bug_670_plugin_restartoption'
X-Git-Tag: experimental-2011.03~6^2~7
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/cdb8a973f09efb2d42875d7854edba9a411719ff?hp=-c

Merge remote branch 'origin/acid-burn/bug_670_plugin_restartoption'
---

cdb8a973f09efb2d42875d7854edba9a411719ff
diff --combined lib/python/Plugins/Extensions/DVDPlayer/plugin.py
index 1f3de1ac,eaf8db64..1cee0aac
mode 100755,100644..100644
--- a/lib/python/Plugins/Extensions/DVDPlayer/plugin.py
+++ b/lib/python/Plugins/Extensions/DVDPlayer/plugin.py
@@@ -4,7 -4,7 +4,7 @@@ from Screens.Screen import Scree
  from Screens.MessageBox import MessageBox
  from Screens.ChoiceBox import ChoiceBox
  from Screens.HelpMenu import HelpableScreen
 -from Screens.InfoBarGenerics import InfoBarSeek, InfoBarPVRState, InfoBarCueSheetSupport, InfoBarShowHide, InfoBarNotifications
 +from Screens.InfoBarGenerics import InfoBarSeek, InfoBarPVRState, InfoBarCueSheetSupport, InfoBarShowHide, InfoBarNotifications, InfoBarAudioSelection, InfoBarSubtitleSupport
  from Components.ActionMap import ActionMap, NumberActionMap, HelpableActionMap
  from Components.Label import Label
  from Components.Sources.StaticText import StaticText
@@@ -195,7 -195,7 +195,7 @@@ class ChapterZap(Screen)
  		self.Timer.callback.append(self.keyOK)
  		self.Timer.start(3000, True)
  
 -class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarPVRState, InfoBarShowHide, HelpableScreen, InfoBarCueSheetSupport):
 +class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarPVRState, InfoBarShowHide, HelpableScreen, InfoBarCueSheetSupport, InfoBarAudioSelection, InfoBarSubtitleSupport):
  	ALLOW_SUSPEND = Screen.SUSPEND_PAUSES
  	ENABLE_RESUME_SUPPORT = True
  	
@@@ -244,6 -244,8 +244,6 @@@
  		self.saved_config_speeds_backward = config.seek.speeds_backward.value
  		self.saved_config_enter_forward = config.seek.enter_forward.value
  		self.saved_config_enter_backward = config.seek.enter_backward.value
 -		self.saved_config_seek_stepwise_minspeed = config.seek.stepwise_minspeed.value
 -		self.saved_config_seek_stepwise_repeat = config.seek.stepwise_repeat.value
  		self.saved_config_seek_on_pause = config.seek.on_pause.value
  		self.saved_config_seek_speeds_slowmotion = config.seek.speeds_slowmotion.value
  
@@@ -253,6 -255,8 +253,6 @@@
  		config.seek.speeds_slowmotion.value = [ ]
  		config.seek.enter_forward.value = "2"
  		config.seek.enter_backward.value = "2"
 -		config.seek.stepwise_minspeed.value = "Never"
 -		config.seek.stepwise_repeat.value = "3"
  		config.seek.on_pause.value = "play"
  
  	def restore_infobar_seek_config(self):
@@@ -261,6 -265,8 +261,6 @@@
  		config.seek.speeds_slowmotion.value = self.saved_config_seek_speeds_slowmotion
  		config.seek.enter_forward.value = self.saved_config_enter_forward
  		config.seek.enter_backward.value = self.saved_config_enter_backward
 -		config.seek.stepwise_minspeed.value = self.saved_config_seek_stepwise_minspeed
 -		config.seek.stepwise_repeat.value = self.saved_config_seek_stepwise_repeat
  		config.seek.on_pause.value = self.saved_config_seek_on_pause
  
  	def __init__(self, session, dvd_device = None, dvd_filelist = [ ], args = None):
@@@ -269,12 -275,10 +269,12 @@@
  		InfoBarNotifications.__init__(self)
  		InfoBarCueSheetSupport.__init__(self, actionmap = "MediaPlayerCueSheetActions")
  		InfoBarShowHide.__init__(self)
 +		InfoBarAudioSelection.__init__(self)
 +		InfoBarSubtitleSupport.__init__(self)
  		HelpableScreen.__init__(self)
  		self.save_infobar_seek_config()
  		self.change_infobar_seek_config()
 -		InfoBarSeek.__init__(self, useSeekBackHack=False)
 +		InfoBarSeek.__init__(self)
  		InfoBarPVRState.__init__(self)
  		self.dvdScreen = self.session.instantiateDialog(DVDOverlay)
  
@@@ -350,7 -354,6 +350,7 @@@
  				"prevTitle": (self.prevTitle, _("jump back to the previous title")),
  				"tv": (self.askLeavePlayer, _("exit DVD player or return to file browser")),
  				"dvdAudioMenu": (self.enterDVDAudioMenu, _("(show optional DVD audio menu)")),
 +				"AudioSelection": (self.enterAudioSelection, _("Select audio track")),
  				"nextAudioTrack": (self.nextAudioTrack, _("switch to the next audio track")),
  				"nextSubtitleTrack": (self.nextSubtitleTrack, _("switch to the next subtitle language")),
  				"nextAngle": (self.nextAngle, _("switch to the next angle")),
@@@ -543,9 -546,6 +543,9 @@@
  			keys.keyPressed(key)
  		return keys
  
 +	def enterAudioSelection(self):
 +		self.audioSelection()
 +
  	def nextAudioTrack(self):
  		self.sendKey(iServiceKeys.keyUser)
  
@@@ -775,5 -775,5 +775,5 @@@ def filescan(**kwargs)
  		)]		
  
  def Plugins(**kwargs):
- 	return [PluginDescriptor(name = "DVDPlayer", description = "Play DVDs", where = PluginDescriptor.WHERE_MENU, fnc = menu),
- 		 	PluginDescriptor(where = PluginDescriptor.WHERE_FILESCAN, fnc = filescan)]
+ 	return [PluginDescriptor(name = "DVDPlayer", description = "Play DVDs", where = PluginDescriptor.WHERE_MENU, needsRestart = True, fnc = menu),
+ 		 	PluginDescriptor(where = PluginDescriptor.WHERE_FILESCAN, needsRestart = True, fnc = filescan)]