git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
now its possible to call ePixmap.setPixmap from python without use of
[enigma2.git]
/
lib
/
service
/
service.cpp
diff --git
a/lib/service/service.cpp
b/lib/service/service.cpp
index 181ec22f26ebf898075b649f01d9bb6fa7944272..f409423635ab1526e0426cd949d4df7cbd0627e4 100644
(file)
--- a/
lib/service/service.cpp
+++ b/
lib/service/service.cpp
@@
-45,7
+45,7
@@
std::string eServiceReference::toString() const
ret += getNum(flags);
for (unsigned int i=0; i<sizeof(data)/sizeof(*data); ++i)
ret+=":"+ getNum(data[i], 0x10);
ret += getNum(flags);
for (unsigned int i=0; i<sizeof(data)/sizeof(*data); ++i)
ret+=":"+ getNum(data[i], 0x10);
- ret+=":"+path;
+ ret+=":"+path;
/* we absolutely have a problem when the path contains a ':' (for example: http://). we need an encoding here. */
if (name.length())
ret+=":"+name;
return ret;
if (name.length())
ret+=":"+name;
return ret;
@@
-171,9
+171,9
@@
int iStaticServiceInformation::getLength(const eServiceReference &ref)
return -1;
}
return -1;
}
-
bool
iStaticServiceInformation::isPlayable(const eServiceReference &ref, const eServiceReference &ignore)
+
int
iStaticServiceInformation::isPlayable(const eServiceReference &ref, const eServiceReference &ignore)
{
{
- return
true
;
+ return
0
;
}
RESULT iServiceInformation::getEvent(ePtr<eServiceEvent> &evt, int m_nownext)
}
RESULT iServiceInformation::getEvent(ePtr<eServiceEvent> &evt, int m_nownext)
@@
-192,6
+192,11
@@
std::string iStaticServiceInformation::getInfoString(const eServiceReference &re
return "";
}
return "";
}
+PyObject *iStaticServiceInformation::getInfoObject(const eServiceReference &ref, int w)
+{
+ Py_RETURN_NONE;
+}
+
int iServiceInformation::getInfo(int w)
{
return -1;
int iServiceInformation::getInfo(int w)
{
return -1;
@@
-204,8
+209,7
@@
std::string iServiceInformation::getInfoString(int w)
PyObject* iServiceInformation::getInfoObject(int w)
{
PyObject* iServiceInformation::getInfoObject(int w)
{
- Py_INCREF(Py_None);
- return Py_None;
+ Py_RETURN_NONE;
}
int iStaticServiceInformation::setInfo(const eServiceReference &ref, int w, int v)
}
int iStaticServiceInformation::setInfo(const eServiceReference &ref, int w, int v)