From 2dc9b0cb83069aaed4dbb3f45b3d15835568d0d9 Mon Sep 17 00:00:00 2001
From: Felix Domke <tmbinc@elitedvb.net>
Date: Thu, 29 Sep 2005 22:08:57 +0000
Subject: [PATCH] follow changes

---
 lib/python/Components/EventInfo.py |  5 ++---
 lib/python/Components/MovieList.py |  5 ++---
 lib/python/Screens/InfoBar.py      | 16 ++++++++--------
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/lib/python/Components/EventInfo.py b/lib/python/Components/EventInfo.py
index ac7ed9b5..c8e5a13f 100644
--- a/lib/python/Components/EventInfo.py
+++ b/lib/python/Components/EventInfo.py
@@ -25,13 +25,12 @@ class EventInfo(PerServiceDisplay):
 		if service != None:
 			info = service.info()
 			if info is not None: 
-				ev = eServiceEventPtr()
-				if info.getEvent(ev, self.now_or_next & 1) == 0:
+				ev = info.getEvent(self.now_or_next & 1)
+				if ev is not None:
 					if self.now_or_next & 2:
 						self.setText("%d min" % (ev.m_duration / 60))
 					else:
 						self.setText(ev.m_event_name)
-		print "new event info in EventInfo! yeah!"
 
 	def stopEvent(self):
 		self.setText(
diff --git a/lib/python/Components/MovieList.py b/lib/python/Components/MovieList.py
index 003302b3..5b07791f 100644
--- a/lib/python/Components/MovieList.py
+++ b/lib/python/Components/MovieList.py
@@ -83,9 +83,8 @@ class MovieList(HTMLComponent, GUIComponent):
 
 		movieList = [ ]
 		while 1:
-			s = eServiceReference()
-			if list.getNext(s):
-				del s
+			s = list.getNext()
+			if not s.valid():
 				del list
 				break
 			movieList.append(s)
diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py
index 0333a8b1..c10dad2d 100644
--- a/lib/python/Screens/InfoBar.py
+++ b/lib/python/Screens/InfoBar.py
@@ -155,16 +155,16 @@ class InfoBar(Screen):
 			
 			# 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
+			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 showMovies(self):
 		self.session.open(MovieSelection)
-
-- 
2.30.2