From 4ff5f1b52b27d7b86d77ce956d79a1453810385b Mon Sep 17 00:00:00 2001
From: methodus <methodus@web.de>
Date: Sun, 23 Sep 2012 21:26:49 +0200
Subject: Added setup menu and the possibility to use live-plugin instead of
 the internal presentation page

---
 httptnt/deviceDescription.ecpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'httptnt')

diff --git a/httptnt/deviceDescription.ecpp b/httptnt/deviceDescription.ecpp
index dfbe853..9646d30 100644
--- a/httptnt/deviceDescription.ecpp
+++ b/httptnt/deviceDescription.ecpp
@@ -23,7 +23,6 @@ using namespace upnp;
   
   const upnp::cMediaServer::Description& serverDescription = server->GetServerDescription();
   std::string deviceUUID = server->GetDeviceUUID();
-  std::string urlBase = webserver.GetBaseUrl();
   std::string presentationUrl = webserver.GetPresentationUrl();
   std::string staticContentUrl = webserver.GetStaticContentUrl();
   
@@ -49,7 +48,7 @@ using namespace upnp;
     <modelURL><$ serverDescription.modelURL $></modelURL> 
     <serialNumber><$ serverDescription.serialNumber $></serialNumber> 
     <UDN><$ deviceUUID $></UDN> 
-    <presentationURL><$ urlBase $><$ presentationUrl $></presentationURL> 
+    <presentationURL><$ presentationUrl $></presentationURL> 
     <dlna:X_DLNADOC>DMS-1.50</dlna:X_DLNADOC> 
     <serviceList>
 <{
@@ -62,7 +61,7 @@ using namespace upnp;
       <service>
         <serviceType><$ serviceDescription.serviceType $></serviceType>
         <serviceId><$ serviceDescription.serviceID $></serviceId>
-        <SCPDURL><$ urlBase $><$ serviceUrl $><$ serviceDescription.SCPDXML $></SCPDURL>
+        <SCPDURL><$ serviceUrl $><$ serviceDescription.SCPDXML $></SCPDURL>
         <controlURL><$ controlUrl $><$ serviceDescription.controlDescriptor $></controlURL>
         <eventSubURL><$ controlUrl $><$ serviceDescription.eventSubscriberDescriptor $></eventSubURL>
       </service>
@@ -79,7 +78,7 @@ using namespace upnp;
         <width><$ (*it).profile.width $></width>
         <height><$ (*it).profile.height $></height>
         <depth><$ (int)(*it).profile.bitDepth $></depth>
-        <url><$ urlBase $><$ staticContentUrl $><$ (*it).filename $></url>
+        <url><$ staticContentUrl $><$ (*it).filename $></url>
       </icon>
 %  };
     </iconList>
-- 
cgit v1.2.3