git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix typo
[enigma2.git]
/
lib
/
service
/
servicefs.cpp
diff --git
a/lib/service/servicefs.cpp
b/lib/service/servicefs.cpp
index b00232127c2843f6ea0891e3ae12be89807a245f..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")
if (extension == ".ts")
type = eServiceFactoryDVB::id;
else if (extension == ".mp3")
- type =
4097
;
+ type =
0x1001
;
else if (extension == ".ogg")
else if (extension == ".ogg")
- type =
4097
;
+ type =
0x1001
;
else if (extension == ".mpg")
else if (extension == ".mpg")
- type =
4097
;
+ type =
0x1001
;
else if (extension == ".vob")
else if (extension == ".vob")
- type =
4097
;
+ type =
0x1001
;
else if (extension == ".wav" || extension == ".wave")
else if (extension == ".wav" || extension == ".wave")
- type =
4097
;
+ type =
0x1001
;
else if (extension == ".m3u" || extension == ".pls" || extension == ".e2pls")
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)
{
if (type != -1)
{
@@
-208,14
+208,14
@@
PyObject *eServiceFS::getContent(const char* format, bool sorted)
for (int cnt=0; cnt < services; ++cnt)
{
eServiceReference &ref=*it++;
for (int cnt=0; cnt < services; ++cnt)
{
eServiceReference &ref=*it++;
- ePyObject tuple = retcount > 1 ? PyTuple_New(retcount) :
0
;
+ ePyObject tuple = retcount > 1 ? PyTuple_New(retcount) :
ePyObject()
;
for (int i=0; i < retcount; ++i)
{
ePyObject tmp;
switch(format[i])
{
case 'R': // service reference (swig)object
for (int i=0; i < retcount; ++i)
{
ePyObject tmp;
switch(format[i])
{
case 'R': // service reference (swig)object
- tmp = N
ew
_eServiceReference(ref);
+ tmp = N
EW
_eServiceReference(ref);
break;
case 'C': // service reference compare string
tmp = PyString_FromString(ref.toCompareString().c_str());
break;
case 'C': // service reference compare string
tmp = PyString_FromString(ref.toCompareString().c_str());