diff options
| author | methodus <methodus@web.de> | 2012-10-22 17:25:37 +0200 |
|---|---|---|
| committer | methodus <methodus@web.de> | 2012-10-22 17:25:37 +0200 |
| commit | 8429eb21629c67900f232d3117f2872061da30e6 (patch) | |
| tree | 06afad7b26cc638e22b7357a84704ed25c1541fd | |
| parent | 418f4f3ba61c5b148bf0a591071a563b5de2fc19 (diff) | |
| download | vdr-plugin-upnp-8429eb21629c67900f232d3117f2872061da30e6.tar.gz vdr-plugin-upnp-8429eb21629c67900f232d3117f2872061da30e6.tar.bz2 | |
Fixed issue, that the database file is stored in the directory where the VDR is started, primarily root directory.
| -rw-r--r-- | common/config.cpp | 1 | ||||
| -rw-r--r-- | media/mediaManager.cpp | 9 | ||||
| -rw-r--r-- | server/webserver.cpp | 4 |
3 files changed, 11 insertions, 3 deletions
diff --git a/common/config.cpp b/common/config.cpp index 1668369..1c9d0d3 100644 --- a/common/config.cpp +++ b/common/config.cpp @@ -25,7 +25,6 @@ upnp::cConfig::cConfig() , bindToAddress(true) , address("0.0.0.0") , port(0) -, databaseFile("metadata.db") { } diff --git a/media/mediaManager.cpp b/media/mediaManager.cpp index fdfaaed..50ddb36 100644 --- a/media/mediaManager.cpp +++ b/media/mediaManager.cpp @@ -106,10 +106,10 @@ void cResourceStreamer::Close(){ cMediaManager::cMediaManager() : systemUpdateID(0) -, databaseFile("metadata.db") , pluginDirectory(DEFAULTPLUGINDIR) , pluginManager(NULL) { + SetDatabaseFile(string()); } cMediaManager::~cMediaManager(){ @@ -704,7 +704,12 @@ cUPnPResourceProvider* cMediaManager::CreateResourceProvider(const string& uri){ } void cMediaManager::SetDatabaseFile(const string& file){ - if(file.empty()) databaseFile = "metadata.db"; + if(file.empty()) +#if APIVERSNUM > 10729 + databaseFile = string(cPlugin::ResourceDirectory(PLUGIN_NAME_I18N)) + "metadata.db"; +#else + databaseFile = string(cPlugin::ConfigDirectory(PLUGIN_NAME_I18N)) + "metadata.db"; +#endif else databaseFile = file; } diff --git a/server/webserver.cpp b/server/webserver.cpp index 2066c7f..b4b0183 100644 --- a/server/webserver.cpp +++ b/server/webserver.cpp @@ -97,7 +97,11 @@ void cWebserver::SetWebserverRootDir(std::string rootDirectory){ if(mWebserverThread.Active()) return; if(rootDirectory.empty()) +#if APIVERSNUM > 10729 + mWebserverRootDir = std::string(cPluginUpnp::ResourceDirectory(PLUGIN_NAME_I18N)) + "/httpdocs/"; +#else mWebserverRootDir = std::string(cPluginUpnp::ConfigDirectory(PLUGIN_NAME_I18N)) + "/httpdocs/"; +#endif else mWebserverRootDir = rootDirectory; } |