X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/b92bc5134f26ded1a6c1de63b0ac6e403c8d7362..6e68543591be09859bbaa4c19e0065e65d8acfe3:/lib/python/Screens/InfoBarGenerics.py

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index 31a9d5a9..3a735dec 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -31,7 +31,7 @@ from Screens.TimeDateInput import TimeDateInput
 from ServiceReference import ServiceReference
 
 from Tools import Notifications
-from Tools.Directories import SCOPE_HDD, resolveFilename
+from Tools.Directories import SCOPE_HDD, resolveFilename, pathExists
 
 from enigma import eTimer, eServiceCenter, eDVBServicePMTHandler, iServiceInformation, \
 	iPlayableService, eServiceReference, eDVBResourceManager, iFrontendInformation, eEPGCache
@@ -730,14 +730,14 @@ class InfoBarSeek:
 		return True
 
 	def __seekableStatusChanged(self):
-		print "seekable status changed!"
+#		print "seekable status changed!"
 		if not self.isSeekable():
 			self["SeekActions"].setEnabled(False)
-			print "not seekable, return to play"
+#			print "not seekable, return to play"
 			self.setSeekState(self.SEEK_STATE_PLAY)
 		else:
 			self["SeekActions"].setEnabled(True)
-			print "seekable"
+#			print "seekable"
 
 	def __serviceStarted(self):
 		self.seekstate = self.SEEK_STATE_PLAY
@@ -1170,8 +1170,8 @@ class InfoBarTimeshift:
 	def __seekableStatusChanged(self):
 		enabled = False
 
-		print "self.isSeekable", self.isSeekable()
-		print "self.timeshift_enabled", self.timeshift_enabled
+#		print "self.isSeekable", self.isSeekable()
+#		print "self.timeshift_enabled", self.timeshift_enabled
 
 		# when this service is not seekable, but timeshift
 		# is enabled, this means we can activate
@@ -1179,7 +1179,7 @@ class InfoBarTimeshift:
 		if not self.isSeekable() and self.timeshift_enabled:
 			enabled = True
 
-		print "timeshift activate:", enabled
+#		print "timeshift activate:", enabled
 		self["TimeshiftActivateActions"].setEnabled(enabled)
 
 	def __serviceStarted(self):
@@ -1356,7 +1356,7 @@ class InfoBarPiP:
 		elif "stop" == use:
 			self.showPiP()
 
-from RecordTimer import parseEvent
+from RecordTimer import parseEvent, RecordTimerEntry
 
 class InfoBarInstantRecord:
 	"""Instant Record - handles the instantRecord action in order to
@@ -1406,10 +1406,14 @@ class InfoBarInstantRecord:
 			if limitEvent:
 				self.session.open(MessageBox, _("No event info found, recording indefinitely."), MessageBox.TYPE_INFO)
 
-		data = (begin, end, name, description, eventid)
+		# TODO: needed?
+		if isinstance(serviceref, eServiceReference):
+			serviceref = ServiceReference(serviceref)
 
-		recording = self.session.nav.recordWithTimer(serviceref, *data)
+		recording = RecordTimerEntry(serviceref, begin, end, name, description, eventid, dirname = config.movielist.last_videodir.value)
 		recording.dontSave = True
+
+		self.session.nav.RecordTimer.record(recording)
 		self.recording.append(recording)
 
 	def isInstantRecordRunning(self):
@@ -1483,9 +1487,13 @@ class InfoBarInstantRecord:
 			self.session.nav.RecordTimer.timeChanged(self.recording[self.selectedEntry])
 
 	def instantRecord(self):
+		dir = config.movielist.last_videodir.value
+		if not pathExists(dir):
+			dir = resolveFilename(SCOPE_HDD)
 		try:
-			stat = os_stat(resolveFilename(SCOPE_HDD))
+			stat = os_stat(dir)
 		except:
+			# XXX: this message is a little odd as we might be recording to a remote device
 			self.session.open(MessageBox, _("No HDD found or HDD not initialized!"), MessageBox.TYPE_ERROR)
 			return
 
@@ -1615,16 +1623,18 @@ class InfoBarSubserviceSelection:
 			}, -1)
 		self["SubserviceQuickzapAction"].setEnabled(False)
 
-		self.session.nav.event.append(self.checkSubservicesAvail) # we like to get service events
+		self.__event_tracker = ServiceEventTracker(screen=self, eventmap=
+			{
+				iPlayableService.evUpdatedInfo: self.checkSubservicesAvail
+			})
 
 		self.bsel = None
 
-	def checkSubservicesAvail(self, ev):
-		if ev == iPlayableService.evUpdatedEventInfo:
-			service = self.session.nav.getCurrentService()
-			subservices = service and service.subServices()
-			if not subservices or subservices.getNumberOfSubservices() == 0:
-				self["SubserviceQuickzapAction"].setEnabled(False)
+	def checkSubservicesAvail(self):
+		service = self.session.nav.getCurrentService()
+		subservices = service and service.subServices()
+		if not subservices or subservices.getNumberOfSubservices() == 0:
+			self["SubserviceQuickzapAction"].setEnabled(False)
 
 	def nextSubservice(self):
 		self.changeSubservice(+1)
@@ -1670,7 +1680,7 @@ class InfoBarSubserviceSelection:
 				tlist.append((i.getName(), i))
 
 			if self.bouquets and len(self.bouquets):
-				keys = ["red", "green", "",  "0", "1", "2", "3", "4", "5", "6", "7", "8", "9" ] + [""] * n
+				keys = ["red", "blue", "",  "0", "1", "2", "3", "4", "5", "6", "7", "8", "9" ] + [""] * n
 				if config.usage.multibouquet.value:
 					tlist = [(_("Quickzap"), "quickzap", service.subServices()), (_("Add to bouquet"), "CALLFUNC", self.addSubserviceToBouquetCallback), ("--", "")] + tlist
 				else: