follow changes

diff --git a/lib/python/Components/EventInfo.py b/lib/python/Components/EventInfo.py
index ac7ed9b530f8c62930a1fc18c113ae48e2cb4120..c8e5a13ff7d621dc8b978a3fff2e5dcf7f8361cf 100644 (file)
--- 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 003302b314f44dd7b68ee435d3cbb06ac41e7a2a..5b07791fbdff22927138515683d3c2b3c2d75acf 100644 (file)
--- 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 0333a8b1a9848be4403b1a6c10304e0960bf678a..c10dad2d6a8573ec47916b02c344ffd7e1884837 100644 (file)
--- 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)
-