use hex instead of decimal

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

diff --git a/lib/service/servicefs.cpp b/lib/service/servicefs.cpp
index 16948854484240a9af262edec8cad69c3e65315d..728bb460c204456b113fdd84aa2da4145918151d 100644 (file)
--- a/lib/service/servicefs.cpp
+++ b/lib/service/servicefs.cpp
@@ -142,17 +142,17 @@ RESULT eServiceFS::getContent(std::list<eServiceReference> &list, bool sorted)
                        if (extension == ".ts")
                                type = eServiceFactoryDVB::id;
                        else if (extension == ".mp3")
-                               type = 4097;
+                               type = 0x1001;
                        else if (extension == ".ogg")
-                               type = 4097;
+                               type = 0x1001;
                        else if (extension == ".mpg")
-                               type = 4097;
+                               type = 0x1001;
                        else if (extension == ".vob")
-                               type = 4097;
+                               type = 0x1001;
                        else if (extension == ".wav" || extension == ".wave")
-                               type = 4097;
+                               type = 0x1001;
                        else if (extension == ".m3u" || extension == ".pls" || extension == ".e2pls")
-                               type = 4098;
+                               type = 4098; // ?? this id is not defined in any service handler, just in python code.
                        
                        if (type != -1)
                        {
@@ -186,7 +186,7 @@ RESULT eServiceFS::getContent(std::list<eServiceReference> &list, bool sorted)
 //   unknown format string chars are returned as python None values !
 PyObject *eServiceFS::getContent(const char* format, bool sorted)
 {
-       PyObject *ret=0;
+       ePyObject ret;
        std::list<eServiceReference> tmplist;
        int retcount=1;
 
@@ -208,14 +208,14 @@ PyObject *eServiceFS::getContent(const char* format, bool sorted)
                for (int cnt=0; cnt < services; ++cnt)
                {
                        eServiceReference &ref=*it++;
-                       PyObject *tuple = retcount > 1 ? PyTuple_New(retcount) : 0;
+                       ePyObject tuple = retcount > 1 ? PyTuple_New(retcount) : ePyObject();
                        for (int i=0; i < retcount; ++i)
                        {
-                               PyObject *tmp=0;
+                               ePyObject tmp;
                                switch(format[i])
                                {
                                case 'R':  // service reference (swig)object
-                                       tmp = New_eServiceReference(ref);
+                                       tmp = NEW_eServiceReference(ref);
                                        break;
                                case 'C':  // service reference compare string
                                        tmp = PyString_FromString(ref.toCompareString().c_str());
@@ -258,7 +258,7 @@ PyObject *eServiceFS::getContent(const char* format, bool sorted)
                                PyList_SET_ITEM(ret, cnt, tuple);
                }
        }
-       return ret ? ret : PyList_New(0);
+       return ret ? (PyObject*)ret : (PyObject*)PyList_New(0);
 }
 
 RESULT eServiceFS::getNext(eServiceReference &ptr)