X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/4de3bf1f4ed536706798a2e39b051a2357ff80d9..f89bd159dfbe3f019513241d4393f7d80ce59af5:/lib/python/Screens/InfoBarGenerics.py

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index 77ca0ef7..b218950d 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -5,20 +5,20 @@ from Components.Label import Label
 from Components.config import configfile
 from ChannelSelection import ChannelSelection
 
-
 from Components.ServiceName import ServiceName
 from Components.EventInfo import EventInfo
-from Components.ServicePosition import ServicePosition
 
 from EpgSelection import EPGSelection
 
 from Screens.MessageBox import MessageBox
-from Screens.MovieSelection import MovieSelection
 from Screens.Volume import Volume
 from Screens.Mute import Mute
 from Screens.Standby import Standby
 
-from enigma import eTimer, eDVBVolumecontrol, quitMainloop
+#from enigma import eTimer, eDVBVolumecontrol, quitMainloop
+from enigma import *
+
+import time
 
 # hack alert!
 from Menu import MainMenu, mdom
@@ -132,8 +132,8 @@ class NumberZap(Screen):
 		if len(self.field) >= 4:
 			self.keyOK()
 
-	def __init__(self, number):
-		Screen.__init__(self)
+	def __init__(self, session, number):
+		Screen.__init__(self, session)
 		self.field = str(number)
 		
 		self["number"] = Label(self.field)
@@ -185,11 +185,8 @@ class InfoBarPowerKey:
 			self.session.open(Standby, self)
 
 	def quit(self):
-		#	self.session.open(Standby, self)
-		configfile.save()
 		quitMainloop(0)
 
-
 class InfoBarNumberZap:
 	""" Handles an initial number for NumberZapping """
 	def __init__(self):
@@ -218,7 +215,7 @@ class InfoBarChannelSelection:
 		#instantiate forever
 		self.servicelist = self.session.instantiateDialog(ChannelSelection)
 
-		self["ChannelSelectActions"] = ActionMap( ["InfoBarChannelSelection"],
+		self["ChannelSelectActions"] = ActionMap( ["InfobarChannelSelection"],
 			{
 				"switchChannelUp": self.switchChannelUp,
 				"switchChannelDown": self.switchChannelDown,
@@ -245,7 +242,7 @@ class InfoBarChannelSelection:
 class InfoBarMenu:
 	""" Handles a menu action, to open the (main) menu """
 	def __init__(self):
-		self["MenuActions"] = ActionMap( [ "InfoBarMenuActions" ], 
+		self["MenuActions"] = ActionMap( [ "InfobarMenuActions" ], 
 			{
 				"mainMenu": self.mainMenu,
 			})
@@ -317,16 +314,16 @@ class InfoBarPVR:
 		seekable.seekRelative(dir, 90 * seektime)
 
 	def seekFwd(self):
-		self.doSeek(+1, 10000)
+		self.doSeek(+1, 60000)
 	
 	def seekBack(self):
-		self.doSeek(-1, 10000)
+		self.doSeek(-1, 60000)
 
 class InfoBarInstantRecord:
 	"""Instant Record - handles the instantRecord action in order to 
 	start/stop instant records"""
 	def __init__(self):
-		self["InstnantRecordActions"] = ActionMap( [ "InfoBarInstantRecord" ],
+		self["InstnantRecordActions"] = ActionMap( [ "InfobarInstantRecord" ],
 			{
 				"instantRecord": self.instantRecord,
 			})
@@ -366,3 +363,19 @@ class InfoBarInstantRecord:
 			self.session.openWithCallback(self.recordQuestionCallback, MessageBox, "Do you want to stop the current\n(instant) recording?")
 		else:
 			self.session.openWithCallback(self.recordQuestionCallback, MessageBox, "Start recording?")
+
+from Screens.AudioSelection import AudioSelection
+
+class InfoBarAudioSelection:
+	def __init__(self):
+		self["AudioSelectionAction"] = ActionMap( [ "InfobarAudioSelectionActions" ], 
+			{
+				"audioSelection": self.audioSelection,
+			})
+
+	def audioSelection(self):
+		service = self.session.nav.getCurrentService()
+		audio = service.audioTracks()
+		n = audio.getNumberOfTracks()
+		if n > 0:
+			self.session.open(AudioSelection, audio)