From 7b44dea4b1dcfcd74b2648e8be0d6e38918cbe0b Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Wed, 22 Jan 2014 09:51:26 +0100
Subject: db/upnp/Device: remove unused UPnPService attributes

---
 src/db/upnp/Device.cxx | 9 ---------
 src/db/upnp/Device.hxx | 7 -------
 2 files changed, 16 deletions(-)

(limited to 'src/db')

diff --git a/src/db/upnp/Device.cxx b/src/db/upnp/Device.cxx
index 8f37a9fb8..2f39e8829 100644
--- a/src/db/upnp/Device.cxx
+++ b/src/db/upnp/Device.cxx
@@ -66,10 +66,6 @@ protected:
 			if (!current.compare("deviceType"))
 				m_device.deviceType = std::move(str);
 			break;
-		case 'e':
-			if (!current.compare("eventSubURL"))
-				m_tservice.eventSubURL = std::move(str);
-			break;
 		case 'f':
 			if (!current.compare("friendlyName"))
 				m_device.friendlyName = std::move(str);
@@ -83,11 +79,6 @@ protected:
 		case 's':
 			if (!current.compare("serviceType"))
 				m_tservice.serviceType = std::move(str);
-			else if (!current.compare("serviceId"))
-				m_tservice.serviceId = std::move(str);
-		case 'S':
-			if (!current.compare("SCPDURL"))
-				m_tservice.SCPDURL = std::move(str);
 			break;
 		case 'U':
 			if (!current.compare("UDN"))
diff --git a/src/db/upnp/Device.hxx b/src/db/upnp/Device.hxx
index d03ad24f6..49bcd2896 100644
--- a/src/db/upnp/Device.hxx
+++ b/src/db/upnp/Device.hxx
@@ -37,19 +37,12 @@ class Error;
 struct UPnPService {
 	// e.g. urn:schemas-upnp-org:service:ConnectionManager:1
 	std::string serviceType;
-	// Unique Id inside device: e.g here THE ConnectionManager
-	std::string serviceId; // e.g. urn:upnp-org:serviceId:ConnectionManager
-	std::string SCPDURL; // Service description URL. e.g.: cm.xml
 	std::string controlURL; // e.g.: /upnp/control/cm
-	std::string eventSubURL; // e.g.: /upnp/event/cm
 
 	void clear()
 	{
 		serviceType.clear();
-		serviceId.clear();
-		SCPDURL.clear();
 		controlURL.clear();
-		eventSubURL.clear();
 	}
 };
 
-- 
cgit v1.2.3