add infrastructure for record service events (not finished yet)

[enigma2.git] / lib / service / listboxservice.cpp

diff --git a/lib/service/listboxservice.cpp b/lib/service/listboxservice.cpp
index 32b9007f71c41675f4f22c68e214e58ffb518afb..abb5e77b0f7a1d5352ed9a81267c68ba120c1546 100644 (file)
--- a/lib/service/listboxservice.cpp
+++ b/lib/service/listboxservice.cpp
@@ -48,15 +48,16 @@ void eListboxServiceContent::setRoot(const eServiceReference &root, bool justSet
        m_root = root;
 
        if (justSet)
+       {
+               m_lst=0;
                return;
+       }
        assert(m_service_center);
        
-       ePtr<iListableService> lst;
-       if (m_service_center->list(m_root, lst))
+       if (m_service_center->list(m_root, m_lst))
                eDebug("no list available!");
-       else
-               if (lst->getContent(m_list))
-                       eDebug("getContent failed");
+       else if (m_lst->getContent(m_list))
+               eDebug("getContent failed");
 
        FillFinished();
 }
@@ -227,10 +228,11 @@ void eListboxServiceContent::setPixmap(int type, ePtr<gPixmap> &pic)
 
 void eListboxServiceContent::sort()
 {
-       ePtr<iListableService> lst;
-       if (!m_service_center->list(m_root, lst))
+       if (!m_lst)
+               m_service_center->list(m_root, m_lst);
+       if (m_lst)
        {
-               m_list.sort(iListableServiceCompare(lst));
+               m_list.sort(iListableServiceCompare(m_lst));
                        /* FIXME: is this really required or can we somehow keep the current entry? */
                cursorHome();
                if (m_listbox)
@@ -304,13 +306,12 @@ int eListboxServiceContent::setCurrentMarked(bool state)
                m_listbox->entryChanged(m_cursor_number);
                if (!state)
                {
-                       ePtr<iListableService> lst;
-                       if (m_service_center->list(m_root, lst))
-                               eDebug("no list available!");
-                       else
+                       if (!m_lst)
+                               m_service_center->list(m_root, m_lst);
+                       if (m_lst)
                        {
                                ePtr<iMutableServiceList> list;
-                               if (lst->startEdit(list))
+                               if (m_lst->startEdit(list))
                                        eDebug("no editable list");
                                else
                                {
@@ -329,6 +330,8 @@ int eListboxServiceContent::setCurrentMarked(bool state)
                                        }
                                }
                        }
+                       else
+                               eDebug("no list available!");
                }
        }