X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/6b2d6f1d24af4d81fda1e9ebc4d11a5df3e8110a..66fe4b3122e8be475ed557a6324e709eb1ca520a:/lib/python/Plugins/Extensions/DVDPlayer/plugin.py

diff --git a/lib/python/Plugins/Extensions/DVDPlayer/plugin.py b/lib/python/Plugins/Extensions/DVDPlayer/plugin.py
old mode 100755
new mode 100644
index 259e52b8..1cee0aac
--- a/lib/python/Plugins/Extensions/DVDPlayer/plugin.py
+++ b/lib/python/Plugins/Extensions/DVDPlayer/plugin.py
@@ -244,8 +244,6 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarP
 		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
 
@@ -255,8 +253,6 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarP
 		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):
@@ -265,8 +261,6 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarP
 		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):
@@ -280,7 +274,7 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarP
 		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)
 
@@ -356,6 +350,7 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarP
 				"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")),
@@ -548,6 +543,9 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarP
 			keys.keyPressed(key)
 		return keys
 
+	def enterAudioSelection(self):
+		self.audioSelection()
+
 	def nextAudioTrack(self):
 		self.sendKey(iServiceKeys.keyUser)
 
@@ -555,8 +553,7 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarP
 		self.sendKey(iServiceKeys.keyUser+1)
 
 	def enterDVDAudioMenu(self):
-		self.audioSelection()
-		#self.sendKey(iServiceKeys.keyUser+2)
+		self.sendKey(iServiceKeys.keyUser+2)
 
 	def nextChapter(self):
 		self.sendKey(iServiceKeys.keyUser+3)
@@ -778,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)]