Follow API improvements

[enigma2.git] / lib / python / Components / MovieList.py

diff --git a/lib/python/Components/MovieList.py b/lib/python/Components/MovieList.py
index 003302b314f44dd7b68ee435d3cbb06ac41e7a2a..ecf50607de61beae12402c27014f58cf1676dcfa 100644 (file)
--- a/lib/python/Components/MovieList.py
+++ b/lib/python/Components/MovieList.py
@@ -7,8 +7,6 @@ from enigma import eServiceReference, eServiceCenter, \
        eServiceCenterPtr, iListableServicePtr, \
        iStaticServiceInformationPtr
 
-
-
 RT_HALIGN_LEFT = 0
 RT_HALIGN_RIGHT = 1
 RT_HALIGN_CENTER = 2
@@ -27,11 +25,10 @@ RT_WRAP = 32
 def MovieListEntry(serviceref, serviceHandler):
        res = [ serviceref ]
 
-       info = iStaticServiceInformationPtr()
-
-       if serviceHandler.info(serviceref, info):
+       info = serviceHandler.info(serviceref)
+       
+       if info is None:
                # ignore service which refuse to info
-               del info
                return
        
        len = info.getLength(serviceref)
@@ -74,18 +71,16 @@ class MovieList(HTMLComponent, GUIComponent):
                
                self.list = [ ]
                
-               serviceHandler = eServiceCenterPtr()
-               eServiceCenter.getInstance(serviceHandler)
-               list = iListableServicePtr()
+               serviceHandler = eServiceCenter.getInstance()
+               list = serviceHandler.list(root)
                
-               if serviceHandler.list(root, list):
+               if list is None:
                        raise "listing of movies failed"
 
                movieList = [ ]
                while 1:
-                       s = eServiceReference()
-                       if list.getNext(s):
-                               del s
+                       s = list.getNext()
+                       if not s.valid():
                                del list
                                break
                        movieList.append(s)