rename funktion

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

diff --git a/lib/service/servicefs.cpp b/lib/service/servicefs.cpp
index 739dd0a6707c03d8cbdc617695ca7b1aa3f4b8ea..cf3f31f62821e6606adf880d8544564cec7662a6 100644 (file)
--- a/lib/service/servicefs.cpp
+++ b/lib/service/servicefs.cpp
@@ -4,6 +4,7 @@
 #include <errno.h>
 #include <lib/service/servicefs.h>
 #include <lib/service/service.h>
+#include <lib/service/servicedvb.h>
 #include <lib/base/init_num.h>
 #include <lib/base/init.h>
 #include <dirent.h>
@@ -11,12 +12,12 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-
 class eStaticServiceFSInformation: public iStaticServiceInformation
 {
        DECLARE_REF(eStaticServiceFSInformation);
 public:
        RESULT getName(const eServiceReference &ref, std::string &name);
+       int getLength(const eServiceReference &ref) { return -1; }
 };
 
 DEFINE_REF(eStaticServiceFSInformation);
@@ -32,7 +33,7 @@ eServiceFactoryFS::eServiceFactoryFS()
 {
        ePtr<eServiceCenter> sc;
        
-       eServiceCenter::getInstance(sc);
+       eServiceCenter::getPrivInstance(sc);
        if (sc)
                sc->addServiceFactory(eServiceFactoryFS::id, this);
        
@@ -43,7 +44,7 @@ eServiceFactoryFS::~eServiceFactoryFS()
 {
        ePtr<eServiceCenter> sc;
        
-       eServiceCenter::getInstance(sc);
+       eServiceCenter::getPrivInstance(sc);
        if (sc)
                sc->removeServiceFactory(eServiceFactoryFS::id);
 }
@@ -75,6 +76,12 @@ RESULT eServiceFactoryFS::info(const eServiceReference &ref, ePtr<iStaticService
        return 0;
 }
 
+RESULT eServiceFactoryFS::offlineOperations(const eServiceReference &, ePtr<iServiceOfflineOperations> &ptr)
+{
+       ptr = 0;
+       return -1;
+}
+
 // eServiceFS
 
 DEFINE_REF(eServiceFS);
@@ -121,15 +128,18 @@ RESULT eServiceFS::getContent(std::list<eServiceReference> &list)
                        list.push_back(service);
                } else
                {
-                       eServiceReference service(eServiceFactoryFS::id, 
-                               eServiceReference::isDirectory|
-                               eServiceReference::canDescent|eServiceReference::mustDescent|
-                               eServiceReference::shouldSort|eServiceReference::sort1,
-                               filename);
-                       service.data[0] = 0;
-                       list.push_back(service);
+                               /* FIIIIIX ME */
+                       if (filename.substr(filename.size()-3) == ".ts")
+                       {
+                               eServiceReference service(eServiceFactoryDVB::id,
+                                       0,
+                                       filename);
+                               service.data[0] = 0;
+                               list.push_back(service);
+                       }
                }
        }
+       closedir(d);
        return 0;
 }
 
@@ -144,11 +154,26 @@ RESULT eServiceFS::getNext(eServiceReference &ptr)
        }
        
        if (!m_list.size())
+       {
+               ptr = eServiceReference();
                return -ERANGE;
+       }
        
        ptr = m_list.front();
        m_list.pop_front();
        return 0;
 }
 
+int eServiceFS::compareLessEqual(const eServiceReference &a, const eServiceReference &b)
+{
+               /* directories first */
+       if ((a.flags & ~b.flags) & eServiceReference::isDirectory)
+               return 1;
+       else if ((~a.flags & b.flags) & eServiceReference::isDirectory)
+               return 0;
+               /* sort by filename */
+       else
+               return a.path < b.path;
+}
+
 eAutoInitPtr<eServiceFactoryFS> init_eServiceFactoryFS(eAutoInitNumbers::service+1, "eServiceFactoryFS");