X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/8c7f6d8e77d3d6356d1c820cbb48fe234d7afbb6..b9bda8a0d43be892f2e5d96ea45ba8d4b2fdae20:/lib/service/servicedvb.cpp

diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index 62fc0482..9d9f2d1f 100644
--- a/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@ -65,16 +65,7 @@ RESULT eStaticServiceDVBInformation::getName(const eServiceReference &ref, std::
 				if (!service_center->info(parent, service_info))
 				{
 					if (!service_info->getName(parent, name))
-					{
-						// just show short name
-						unsigned int pos = name.find("\xc2\x86");
-						if ( pos != std::string::npos )
-							name.erase(0, pos+2);
-						pos = name.find("\xc2\x87");
-						if ( pos != std::string::npos )
-							name.erase(pos);
-						name+=" - ";
-					}
+						name=buildShortName(name) + " - ";
 				}
 			}
 		}
@@ -730,6 +721,7 @@ RESULT eDVBServiceList::getContent(std::list<eServiceReference> &list, bool sort
 //   S = Service Reference (as python string object .. same as ref.toString())
 //   C = Service Reference (as python string object .. same as ref.toCompareString())
 //   N = Service Name (as python string object)
+//   n = Short Service Name (short name brakets used) (as python string object)
 //   when exactly one return value per service is selected in the format string,
 //   then each value is directly a list entry
 //   when more than one value is returned per service, then the list is a list of
@@ -750,7 +742,7 @@ PyObject *eDVBServiceList::getContent(const char* format, bool sorted)
 		ePtr<iStaticServiceInformation> sptr;
 		eServiceCenterPtr service_center;
 
-		if (strchr(format, 'N'))
+		if (strchr(format, 'N') || strchr(format, 'n'))
 			eServiceCenter::getPrivInstance(service_center);
 
 		ret = PyList_New(services);
@@ -782,6 +774,30 @@ PyObject *eDVBServiceList::getContent(const char* format, bool sorted)
 						{
 							std::string name;
 							sptr->getName(ref, name);
+
+							// filter short name brakets
+							unsigned int pos;
+							while((pos = name.find("\xc2\x86")) != std::string::npos)
+								name.erase(pos,2);
+							while((pos = name.find("\xc2\x87")) != std::string::npos)
+								name.erase(pos,2);
+
+							if (name.length())
+								tmp = PyString_FromString(name.c_str());
+						}
+					}
+					if (!tmp)
+						tmp = PyString_FromString("<n/a>");
+					break;
+				case 'n':  // short service name
+					if (service_center)
+					{
+						service_center->info(ref, sptr);
+						if (sptr)
+						{
+							std::string name;
+							sptr->getName(ref, name);
+							name = buildShortName(name);
 							if (name.length())
 								tmp = PyString_FromString(name.c_str());
 						}
@@ -1754,19 +1770,54 @@ int eDVBServiceBase::getFrontendInfo(int w)
 	return fe->readFrontendData(w);
 }
 
-PyObject *eDVBServiceBase::getFrontendData(bool original)
+PyObject *eDVBServiceBase::getFrontendData()
 {
-	ePyObject ret;
+	ePyObject ret = PyDict_New();
+	if (ret)
+	{
+		eUsePtr<iDVBChannel> channel;
+		if(!m_service_handler.getChannel(channel))
+		{
+			ePtr<iDVBFrontend> fe;
+			if(!channel->getFrontend(fe))
+				fe->getFrontendData(ret);
+		}
+	}
+	else
+		Py_RETURN_NONE;
+	return ret;
+}
 
-	eUsePtr<iDVBChannel> channel;
-	if(!m_service_handler.getChannel(channel))
+PyObject *eDVBServiceBase::getFrontendStatus()
+{
+	ePyObject ret = PyDict_New();
+	if (ret)
 	{
-		ePtr<iDVBFrontend> fe;
-		if(!channel->getFrontend(fe))
+		eUsePtr<iDVBChannel> channel;
+		if(!m_service_handler.getChannel(channel))
 		{
-			ret = fe->readTransponderData(original);
-			if (ret)
+			ePtr<iDVBFrontend> fe;
+			if(!channel->getFrontend(fe))
+				fe->getFrontendStatus(ret);
+		}
+	}
+	else
+		Py_RETURN_NONE;
+	return ret;
+}
+
+PyObject *eDVBServiceBase::getTransponderData(bool original)
+{
+	ePyObject ret = PyDict_New();
+	if (ret)
+	{
+		eUsePtr<iDVBChannel> channel;
+		if(!m_service_handler.getChannel(channel))
+		{
+			ePtr<iDVBFrontend> fe;
+			if(!channel->getFrontend(fe))
 			{
+				fe->getTransponderData(ret, original);
 				ePtr<iDVBFrontendParameters> feparm;
 				channel->getCurrentFrontendParameters(feparm);
 				if (feparm)
@@ -1792,11 +1843,30 @@ PyObject *eDVBServiceBase::getFrontendData(bool original)
 			}
 		}
 	}
-	if (!ret)
+	else
 		Py_RETURN_NONE;
 	return ret;
 }
 
+PyObject *eDVBServiceBase::getAll(bool original)
+{
+	ePyObject ret = getTransponderData(original);
+	if (ret != Py_None)
+	{
+		eUsePtr<iDVBChannel> channel;
+		if(!m_service_handler.getChannel(channel))
+		{
+			ePtr<iDVBFrontend> fe;
+			if(!channel->getFrontend(fe))
+			{
+				fe->getFrontendData(ret);
+				fe->getFrontendStatus(ret);
+			}
+		}
+	}
+	return ret;
+}
+
 int eDVBServicePlay::getNumberOfSubservices()
 {
 	ePtr<eServiceEvent> evt;