X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/bcfb71b423699d8f7e1d1e7bb5dc24ad4413a4ae..4404768ce6bb07bf2784da7806444acd462c3a33:/lib/service/service.cpp

diff --git a/lib/service/service.cpp b/lib/service/service.cpp
index 11f88b1f..f4094236 100644
--- a/lib/service/service.cpp
+++ b/lib/service/service.cpp
@@ -4,7 +4,7 @@
 #include <lib/service/service.h>
 #include <lib/base/init_num.h>
 #include <lib/base/init.h>
-#include <Python.h>
+#include <lib/python/python.h>
 
 eServiceReference::eServiceReference(const std::string &string)
 {
@@ -45,12 +45,22 @@ 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+=":"+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;
 }
 
+std::string eServiceReference::toCompareString() const
+{
+	std::string ret;
+	ret += getNum(type);
+	ret += ":0";
+	for (unsigned int i=0; i<sizeof(data)/sizeof(*data); ++i)
+		ret+=":"+getNum(data[i], 0x10);
+	ret+=":"+path;
+	return ret;
+}
 
 eServiceCenter *eServiceCenter::instance;
 
@@ -161,9 +171,9 @@ int iStaticServiceInformation::getLength(const eServiceReference &ref)
 	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)
@@ -182,6 +192,11 @@ std::string iStaticServiceInformation::getInfoString(const eServiceReference &re
 	return "";
 }
 
+PyObject *iStaticServiceInformation::getInfoObject(const eServiceReference &ref, int w)
+{
+	Py_RETURN_NONE;
+}
+
 int iServiceInformation::getInfo(int w)
 {
 	return -1;
@@ -194,8 +209,27 @@ std::string iServiceInformation::getInfoString(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)
+{
+	return -1;
+}
+
+int iStaticServiceInformation::setInfoString(const eServiceReference &ref, int w, const char *v)
+{
+	return -1;
+}
+
+int iServiceInformation::setInfo(int w, int v)
+{
+	return -1;
+}
+
+int iServiceInformation::setInfoString(int w, const char *v)
+{
+	return -1;
 }
 
 eAutoInitPtr<eServiceCenter> init_eServiceCenter(eAutoInitNumbers::service, "eServiceCenter");