dont try to get frontend informations when the eDVBServicePlay is a pvr service

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

diff --git a/lib/service/servicefs.cpp b/lib/service/servicefs.cpp
index 5a945679f9e3ec857052037095e1bf489e6a704e..1afdd1697b129d3f3d87f0967be68a4af848fe03 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 <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>
 #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>
 
 #include <sys/stat.h>
 #include <unistd.h>
 

-

 class eStaticServiceFSInformation: public iStaticServiceInformation
 {
 class eStaticServiceFSInformation: public iStaticServiceInformation
 {

-       DECLARE_REF;
+       DECLARE_REF(eStaticServiceFSInformation);

 public:
        RESULT getName(const eServiceReference &ref, std::string &name);
 public:
        RESULT getName(const eServiceReference &ref, std::string &name);

+       int getLength(const eServiceReference &ref) { return -1; }

 };
 
 DEFINE_REF(eStaticServiceFSInformation);
 };
 
 DEFINE_REF(eStaticServiceFSInformation);


@@ -32,7 +33,7 @@ eServiceFactoryFS::eServiceFactoryFS()
 {
        ePtr<eServiceCenter> sc;
        
 {
        ePtr<eServiceCenter> sc;
        

-       eServiceCenter::getInstance(sc);
+       eServiceCenter::getPrivInstance(sc);

        if (sc)
                sc->addServiceFactory(eServiceFactoryFS::id, this);
        
        if (sc)
                sc->addServiceFactory(eServiceFactoryFS::id, this);
        


@@ -43,7 +44,7 @@ eServiceFactoryFS::~eServiceFactoryFS()
 {
        ePtr<eServiceCenter> sc;
        
 {
        ePtr<eServiceCenter> sc;
        

-       eServiceCenter::getInstance(sc);
+       eServiceCenter::getPrivInstance(sc);

        if (sc)
                sc->removeServiceFactory(eServiceFactoryFS::id);
 }
        if (sc)
                sc->removeServiceFactory(eServiceFactoryFS::id);
 }


@@ -75,12 +76,19 @@ RESULT eServiceFactoryFS::info(const eServiceReference &ref, ePtr<iStaticService
        return 0;
 }
 
        return 0;
 }
 

+RESULT eServiceFactoryFS::offlineOperations(const eServiceReference &, ePtr<iServiceOfflineOperations> &ptr)
+{
+       ptr = 0;
+       return -1;
+}
+

 // eServiceFS
 
 DEFINE_REF(eServiceFS);
 
 eServiceFS::eServiceFS(const char *path): path(path)
 {
 // eServiceFS
 
 DEFINE_REF(eServiceFS);
 
 eServiceFS::eServiceFS(const char *path): path(path)
 {

+       m_list_valid = 0;

 }
 
 eServiceFS::~eServiceFS()
 }
 
 eServiceFS::~eServiceFS()


@@ -120,16 +128,58 @@ RESULT eServiceFS::getContent(std::list<eServiceReference> &list)
                        list.push_back(service);
                } else
                {
                        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;
+}
+
+RESULT eServiceFS::getNext(eServiceReference &ptr)
+{
+       if (!m_list_valid)
+       {
+               m_list_valid = 1;
+               int res = getContent(m_list);
+               if (res)
+                       return res;
+       }
+       
+       if (!m_list.size())
+       {
+               ptr = eServiceReference();
+               return -ERANGE;
+       }
+       
+       ptr = m_list.front();
+       m_list.pop_front();

        return 0;
 }
 
        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;
+}
+
+RESULT eServiceFS::startEdit(ePtr<iMutableServiceList> &res)
+{
+       res = 0;
+       return -1;
+}
+

 eAutoInitPtr<eServiceFactoryFS> init_eServiceFactoryFS(eAutoInitNumbers::service+1, "eServiceFactoryFS");
 eAutoInitPtr<eServiceFactoryFS> init_eServiceFactoryFS(eAutoInitNumbers::service+1, "eServiceFactoryFS");