diff options
Diffstat (limited to 'media/mediaManager.cpp')
| -rw-r--r-- | media/mediaManager.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/media/mediaManager.cpp b/media/mediaManager.cpp index 7064daa..670a158 100644 --- a/media/mediaManager.cpp +++ b/media/mediaManager.cpp @@ -21,8 +21,6 @@ namespace upnp { -#define DEFAULTPLUGINDIR PLUGINDIR - static const char* DIDLFragment = "<DIDL-Lite " "xmlns=\"urn:schemas-upnp-org:metadata-1-0/DIDL-Lite/\" " "xmlns:dc=\"http://purl.org/dc/elements/1.1/\" " @@ -107,7 +105,6 @@ void cResourceStreamer::Close(){ cMediaManager::cMediaManager() : systemUpdateID(0) -, pluginDirectory(DEFAULTPLUGINDIR) , pluginManager(NULL) { SetDatabaseDir(string()); @@ -597,8 +594,8 @@ bool cMediaManager::Initialise(){ dsyslog("UPnP\tLoading Plugins..."); pluginManager = new upnp::cPluginManager(); - if(!pluginManager->LoadPlugins(pluginDirectory)){ - esyslog("UPnP\tError while loading upnp plugin directory '%s'", pluginDirectory.c_str()); + if(!pluginManager->LoadPlugins()){ + esyslog("UPnP\tError while loading upnp plugins"); return false; } else { dsyslog("UPnP\tFound %d plugins", pluginManager->Count()); @@ -721,11 +718,6 @@ void cMediaManager::SetDatabaseDir(const string& file){ databaseFile += "/metadata.db"; } -void cMediaManager::SetPluginDirectory(const string& directory){ - if(directory.empty()) pluginDirectory = DEFAULTPLUGINDIR; - else pluginDirectory = directory; -} - void cMediaManager::Action(){ string uri; while(!scanTargets.empty()){ |