[eStreamServer]

* add hostname to streamStatusChanged callback

Author: jbleyel

lib/dvb/streamserver.cpp

@@ -175,7 +175,7 @@ void eStreamClient::notifier(int what)
 				pos = serviceref.find('?');
 				if (pos == std::string::npos)
 				{
-					parent->startStream(serviceref);
+					parent->startStream(serviceref, m_remotehost);
 
 					eDebug("[eDVBServiceStream] stream ref: %s", serviceref.c_str());
 					if (eDVBServiceStream::start(serviceref.c_str(), streamFd) >= 0)
@@ -200,7 +200,7 @@ void eStreamClient::notifier(int what)
 					if (posdur != std::string::npos)
 					{
 
-						parent->startStream(serviceref);
+						parent->startStream(serviceref, m_remotehost);
 
 						if (eDVBServiceStream::start(serviceref.c_str(), streamFd) >= 0)
 						{
@@ -360,15 +360,16 @@ void eStreamServer::connectionLost(eStreamClient *client)
 	if (it != clients.end())
 	{
         std::string serviceref = it->getServiceref();
+        std::string client = it->getRemoteHost();
 		clients.erase(it);
-		streamStatusChanged(2,serviceref.c_str());
+		streamStatusChanged(2,serviceref.c_str(), client.c_str());
 		eNavigation::getInstance()->removeStreamService(serviceref);
 	}
 }
 
-void eStreamServer::startStream(const std::string serviceref)
+void eStreamServer::startStream(const std::string serviceref, const std::string remotehost)
 {
-	streamStatusChanged(0,serviceref.c_str());
+	streamStatusChanged(0,serviceref.c_str(), remotehost.c_str());
 	eNavigation::getInstance()->addStreamService(serviceref);
 }
 
@@ -377,7 +378,7 @@ void eStreamServer::stopStream()
 	eSmartPtrList<eStreamClient>::iterator it = clients.begin();
 	if (it != clients.end())
 	{
-		streamStatusChanged(1,it->getServiceref().c_str());
+		streamStatusChanged(1,it->getServiceref().c_str(), it->getRemoteHost().c_str());
 		eNavigation::getInstance()->removeStreamService(it->getServiceref());
 		it->stopStream();
 	}

lib/dvb/streamserver.h

@@ -71,11 +71,11 @@ class eStreamServer: public eServerSocket
 
 	static eStreamServer *getInstance();
 	void stopStream();
-	void startStream(const std::string serviceref);
+	void startStream(const std::string serviceref, const std::string remotehost);
 	bool stopStreamClient(const std::string remotehost, const std::string serviceref);
 	PyObject *getConnectedClients();
 	PyObject *getConnectedClientDetails(int index);
-	PSignal2<void,int,const char *> streamStatusChanged;
+	PSignal3<void,int,const char *,const char *> streamStatusChanged;
 
 	enum
 	{

lib/python/Navigation.py

@@ -505,7 +505,8 @@ def stopRecordService(self, service):
 			ret = self.pnav and self.pnav.stopRecordService(service)
 		return ret
 
-	def streamStatusChangedCB(self, status, sref):
+	def streamStatusChangedCB(self, status, sref, host):
+		print(f"[Navigation] Stream status changed: {status}, {sref}, {host}.")
 		recService = iRecordableServicePtr()  # This is only a dummy variable
 		if status == 0:
 			self.activeStreamings = [recService]  # TODO: Check if this is correct. Add support for multiple streams.

lib/python/enigma_python.i

@@ -340,9 +340,15 @@ public:
 	$1 = $input->get();
 }
 
-%template(PSignal2VIS) PSignal2<void,int,const char *c>;
+template<class R, class P0, class P1, class P2> class PSignal3
+{
+public:
+	PyObject *get();
+};
+
+%template(PSignal3VISS) PSignal3<void,int,const char *,const char *>;
 
-%typemap(out) PSignal2VIS {
+%typemap(out) PSignal3VISS {
 	$1 = $input->get();
 }