X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/87a694395b1942209d18a8a1fc5105cb6ac3d754..3285eb3ebcd0ba134ac6b80337f8519d5a0da5b0:/lib/python/Screens/InfoBarGenerics.py?ds=sidebyside

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index f1744fed..85b1d80f 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -5,17 +5,15 @@ from Components.ActionMap import NumberActionMap
 from Components.BlinkingPixmap import BlinkingPixmapConditional
 from Components.Harddisk import harddiskmanager
 from Components.Input import Input
-from Components.Label import *
-from Components.Pixmap import Pixmap, PixmapConditional
+from Components.Label import Label
+from Components.Pixmap import Pixmap
 from Components.PluginComponent import plugins
-from Components.ProgressBar import *
 from Components.ServiceEventTracker import ServiceEventTracker
 from Components.Sources.CurrentService import CurrentService
 from Components.Sources.EventInfo import EventInfo
 from Components.Sources.FrontendStatus import FrontendStatus
 from Components.Sources.Boolean import Boolean
 from Components.Sources.Clock import Clock
-from Components.TimerList import TimerEntryComponent
 from Components.config import config, ConfigBoolean, ConfigClock
 from EpgSelection import EPGSelection
 from Plugins.Plugin import PluginDescriptor
@@ -406,6 +404,7 @@ class InfoBarEPG:
 		self["EPGActions"] = HelpableActionMap(self, "InfobarEPGActions", 
 			{
 				"showEventInfo": (self.openEventView, _("show EPG...")),
+				"showSingleServiceEPG": (self.openSingleServiceEPG, _("show single service EPG...")),
 				"showInfobarOrEpgWhenInfobarAlreadyVisible": self.showEventInfoWhenNotVisible,
 			})
 
@@ -670,6 +669,8 @@ class InfoBarSeek:
 		self["SeekActions"].setEnabled(False)
 
 		self.seekstate = self.SEEK_STATE_PLAY
+		
+		self.seek_flag = True
 
 		self.onPlayStateChanged = [ ]
 
@@ -832,6 +833,7 @@ class InfoBarSeek:
 				seekable.seekRelative(-1, 3)
 
 	def seekFwdDef(self):
+		self.seek_flag = False
 		seconds = config.usage.self_defined_seek.value
 		print "Seek", seconds, "seconds self defined forward"
 		seekable = self.getSeek()
@@ -839,6 +841,7 @@ class InfoBarSeek:
 			seekable.seekRelative(1, seconds * 90000)
 		
 	def seekBackDef(self):
+		self.seek_flag = False
 		seconds = config.usage.self_defined_seek.value
 		print "Seek", seconds, "seconds self defined backward"
 		seekable = self.getSeek()
@@ -893,11 +896,14 @@ class InfoBarSeek:
 		self.doSeek(0)
 
 	def seekRelative(self, diff):
-		seekable = self.getSeek()
-		if seekable is not None:
-			print "seekRelative: res:", seekable.seekRelative(1, diff)
+		if self.seek_flag == True:
+			seekable = self.getSeek()
+			if seekable is not None:
+				print "seekRelative: res:", seekable.seekRelative(1, diff)
+			else:
+				print "seek failed!"
 		else:
-			print "seek failed!"
+			self.seek_flag = True
 
 	def seekRelativeToEnd(self, diff):
 		assert diff <= 0, "diff is expected to be negative!"
@@ -1197,7 +1203,7 @@ class InfoBarPlugins:
 		return list
 
 	def runPlugin(self, plugin):
-		plugin(session = self.session)
+		plugin(session = self.session, servicelist = self.servicelist)
 
 # depends on InfoBarExtensions
 class InfoBarSleepTimer:
@@ -1352,7 +1358,7 @@ class InfoBarInstantRecord:
 			if not x in self.session.nav.RecordTimer.timer_list:
 				self.recording.remove(x)
 			elif x.dontSave and x.isRunning():
-				list.append(TimerEntryComponent(x, False))
+				list.append((x, False))
 
 		if answer[1] == "changeduration":
 			if len(self.recording) == 1: