summaryrefslogtreecommitdiff
path: root/server
diff options
context:
space:
mode:
authormethodus <methodus@web.de>2012-09-30 15:52:54 +0200
committermethodus <methodus@web.de>2012-09-30 15:52:54 +0200
commitc8e697daf68f1c545ee3962d2f2e9b411c56b4f2 (patch)
tree48bc206a65ad956ab4284113c33d4b1d50398495 /server
parentdd3e8652f530c35febcc3f595e38443395f79198 (diff)
downloadvdr-plugin-upnp-c8e697daf68f1c545ee3962d2f2e9b411c56b4f2.tar.gz
vdr-plugin-upnp-c8e697daf68f1c545ee3962d2f2e9b411c56b4f2.tar.bz2
Working on plugin interface. PluginManager almost done.
Diffstat (limited to 'server')
-rw-r--r--server/server.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/server/server.cpp b/server/server.cpp
index acfe7a1..95e7f16 100644
--- a/server/server.cpp
+++ b/server/server.cpp
@@ -179,6 +179,7 @@ bool cMediaServer::Initialize(){
}
mWebserver = new cWebserver(GetServerIPAddress());
+ mMediaManager = new cMediaManager();
if(mCurrentConfiguration.expertSettings){
@@ -204,12 +205,12 @@ bool cMediaServer::Initialize(){
mWebserver->SetPresentationUrl(ss.str());
}
-
if(mCurrentConfiguration.webServerPort)
mWebserver->SetListenerPort(mCurrentConfiguration.webServerPort);
- }
- mMediaManager = new cMediaManager();
+ if(!mCurrentConfiguration.databaseFile.empty())
+ mMediaManager->SetDatabaseFile(mCurrentConfiguration.databaseFile);
+ }
ret = UpnpSetMaxContentLength(GetMaxContentLength());