diff options
Diffstat (limited to 'server')
| -rw-r--r-- | server/connectionManager.cpp | 1 | ||||
| -rw-r--r-- | server/connectionManager.o | bin | 313200 -> 313200 bytes | |||
| -rw-r--r-- | server/contentDirectory.o | bin | 232952 -> 232960 bytes | |||
| -rw-r--r-- | server/server.cpp | 4 | ||||
| -rw-r--r-- | server/server.o | bin | 327792 -> 327800 bytes | |||
| -rw-r--r-- | server/service.o | bin | 84424 -> 84424 bytes | |||
| -rw-r--r-- | server/webserver.cpp | 7 | ||||
| -rw-r--r-- | server/webserver.o | bin | 549288 -> 549144 bytes |
8 files changed, 7 insertions, 5 deletions
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 Binary files differindex e3b3e75..1ec3f19 100644 --- a/server/connectionManager.o +++ b/server/connectionManager.o diff --git a/server/contentDirectory.o b/server/contentDirectory.o Binary files differindex 488881a..50d633d 100644 --- a/server/contentDirectory.o +++ b/server/contentDirectory.o 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 Binary files differindex f603bbb..bec8a88 100644 --- a/server/server.o +++ b/server/server.o diff --git a/server/service.o b/server/service.o Binary files differindex a130cda..fbfdbe6 100644 --- a/server/service.o +++ b/server/service.o 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 Binary files differindex c6789ea..dc6db8b 100644 --- a/server/webserver.o +++ b/server/webserver.o |