From 216e4086520765fface77acd86a718dfb6e627e2 Mon Sep 17 00:00:00 2001
From: methodus <methodus@web.de>
Date: Sat, 15 Sep 2012 23:37:25 +0200
Subject: Anpassung der Plugin-Schnittstelle

---
 server/connectionManager.cpp |   1 -
 server/connectionManager.o   | Bin 313200 -> 313200 bytes
 server/contentDirectory.o    | Bin 232952 -> 232960 bytes
 server/server.cpp            |   4 +++-
 server/server.o              | Bin 327792 -> 327800 bytes
 server/service.o             | Bin 84424 -> 84424 bytes
 server/webserver.cpp         |   7 ++++---
 server/webserver.o           | Bin 549288 -> 549144 bytes
 8 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'server')

diff --git a/server/connectionManager.cpp b/server/connectionManager.cpp
index fd16d97..cea68bc 100644
--- a/server/connectionManager.cpp
+++ b/server/connectionManager.cpp
@@ -7,7 +7,6 @@
 
 #include "../include/connectionManager.h"
 #include "../include/tools.h"
-#include "../include/server.h"
 #include "../include/media/mediaManager.h"
 #include <vdr/i18n.h>
 #include <upnp/upnptools.h>
diff --git a/server/connectionManager.o b/server/connectionManager.o
index e3b3e75..1ec3f19 100644
Binary files a/server/connectionManager.o and b/server/connectionManager.o differ
diff --git a/server/contentDirectory.o b/server/contentDirectory.o
index 488881a..50d633d 100644
Binary files a/server/contentDirectory.o and b/server/contentDirectory.o differ
diff --git a/server/server.cpp b/server/server.cpp
index a211c1c..69c0a2c 100644
--- a/server/server.cpp
+++ b/server/server.cpp
@@ -114,6 +114,8 @@ bool cMediaServer::Start(){
     return false;
   }
 
+
+
   mIsRunning = true;
 
   return IsRunning();
@@ -284,7 +286,7 @@ int cMediaServer::ActionCallback(Upnp_EventType eventtype, void *event, void *co
   case UPNP_EVENT_SUBSCRIPTION_REQUEST:
     eventRequest = (Upnp_Subscription_Request*) event;
 
-    dsyslog("UPnP\tSubscription request: %s", eventRequest->ServiceId);
+    dsyslog("UPnP\tSubscription request from: %s", eventRequest->ServiceId);
 
     if(!mediaServer->CheckDeviceUUID(eventRequest->UDN)){
       esyslog("UPnP\tUPnP Callback - event request not for this device");
diff --git a/server/server.o b/server/server.o
index f603bbb..bec8a88 100644
Binary files a/server/server.o and b/server/server.o differ
diff --git a/server/service.o b/server/service.o
index a130cda..fbfdbe6 100644
Binary files a/server/service.o and b/server/service.o differ
diff --git a/server/webserver.cpp b/server/webserver.cpp
index ce8acda..b67076b 100644
--- a/server/webserver.cpp
+++ b/server/webserver.cpp
@@ -17,7 +17,7 @@ cWebserver::cWebserver(std::string address)
 , mWebserverThread(*this)
 {
   SetWebserverRootDir(string(), string(), string());
-  SetServiceUrl("services/", string());
+  SetServiceUrl(string(), string());
 }
 
 cWebserver::~cWebserver(){
@@ -109,14 +109,15 @@ void cWebserver::SetWebserverRootDir(std::string rootDirectory, std::string stat
 void cWebserver::SetServiceUrl(std::string descriptionUrl, std::string controlUrl){
   if(mWebserverThread.Active()) return;
 
-  if(descriptionUrl.empty())
+  if(descriptionUrl.empty()){
     mServiceUrl = "services/";
+  }
   else
     mServiceUrl = descriptionUrl;
 
   if(controlUrl.empty()){
     stringstream s;
-    s << "http://" << UpnpGetServerIpAddress() << ":" << UpnpGetServerPort() << "/" << mServiceUrl;
+    s << "http://" << UpnpGetServerIpAddress() << ":" << UpnpGetServerPort() << "/" << "services/";
 
     mControlUrl = s.str();
   } else {
diff --git a/server/webserver.o b/server/webserver.o
index c6789ea..dc6db8b 100644
Binary files a/server/webserver.o and b/server/webserver.o differ
-- 
cgit v1.2.3