X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/d17eccddcb6e6a6e4a5c259514355e791933139d..173e6c3e6d613fe18d11c07ea8f52f457ac96e4b:/lib/python/Screens/InfoBar.py

diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py
index 0333a8b1..73825f25 100644
--- a/lib/python/Screens/InfoBar.py
+++ b/lib/python/Screens/InfoBar.py
@@ -141,30 +141,42 @@ class InfoBar(Screen):
 	def	quit(self):
 		configfile.save()
 		quitMainloop()
+	
+	def stopCurrentRecording(self):	
+		print "remove entry"
+		self.session.nav.RecordTimer.removeEntry(self.recording)
+		self.recording = None
+	
+	def startInstantRecording(self):
+		serviceref = self.session.nav.getCurrentlyPlayingServiceReference()
+			
+		# try to get event info
+		epg = None
+		try:
+			service = self.session.nav.getCurrentService()
+			info = service.info()
+			ev = info.getEvent(0)
+			epg = ev
+		except:
+			pass
+		
+		# fix me, description. 
+		self.recording = self.session.nav.recordWithTimer(time.time(), time.time() + 30, serviceref, epg, "instant record")
+
+	def recordQuestionCallback(self, answer):
+		if answer == False:
+			return
 		
+		if self.recording != None:
+			self.stopCurrentRecording()
+		else:
+			self.startInstantRecording()
+
 	def instantRecord(self):
-		#self.session.open(MessageBox, "this would be an instant recording! do you really know what you're doing?!")
-		#return
-	
 		if self.recording != None:
-			print "remove entry"
-			self.session.nav.RecordTimer.removeEntry(self.recording)
-			self.recording = None
+			self.session.openWithCallback(self.recordQuestionCallback, MessageBox, "Do you want to stop the current\n(instant) recording?")
 		else:
-			serviceref = self.session.nav.getCurrentlyPlayingServiceReference()
-			
-			# try to get event info
-			epg = None
-			service = self.session.nav.getCurrentService()
-			if service != None:
-				info = iServiceInformationPtr()
-				if not service.info(info):
-					ev = eServiceEventPtr()
-					if info.getEvent(ev, 0) == 0:
-						epg = ev
-			# fix me, description. 
-			self.recording = self.session.nav.recordWithTimer(time.time(), time.time() + 30, serviceref, epg, "instant record")
-	
+			self.session.openWithCallback(self.recordQuestionCallback, MessageBox, "Start recording?")
+
 	def showMovies(self):
 		self.session.open(MovieSelection)
-