summaryrefslogtreecommitdiff
path: root/media
diff options
context:
space:
mode:
Diffstat (limited to 'media')
-rw-r--r--media/mediaManager.cpp2
-rw-r--r--media/pluginManager.cpp6
2 files changed, 6 insertions, 2 deletions
diff --git a/media/mediaManager.cpp b/media/mediaManager.cpp
index 8b9cce7..e8ee505 100644
--- a/media/mediaManager.cpp
+++ b/media/mediaManager.cpp
@@ -396,7 +396,7 @@ bool cMediaManager::Initialise(){
pluginManager = new upnp::cPluginManager(this);
if(!pluginManager->LoadPlugins(pluginDirectory)){
- esyslog("UPnP\tError while loading upnp plugin directory '%s'", pluginDirectory);
+ esyslog("UPnP\tError while loading upnp plugin directory '%s'", pluginDirectory.c_str());
return false;
}
diff --git a/media/pluginManager.cpp b/media/pluginManager.cpp
index 662ae4b..b35cd49 100644
--- a/media/pluginManager.cpp
+++ b/media/pluginManager.cpp
@@ -7,6 +7,7 @@
#include "../include/plugin.h"
#include "../include/tools.h"
+#include "../include/pluginManager.h"
#include <string>
#include <dlfcn.h>
#include <dirent.h>
@@ -287,7 +288,7 @@ bool upnp::cPluginManager::LoadPlugins(const string& directory){
}
}
}
- closedir(dp);
+ closedir(dirHandle);
return true;
}
@@ -311,10 +312,13 @@ bool upnp::cPluginManager::DLL::Load(){
provider = (FunctionPtr)dlsym(handle, "UPnPCreateResourceProvider");
if (!(error = dlerror())){
isyslog("UPnP\tFound provider in %s", file.c_str());
+ return true;
}
+
profiler = (FunctionPtr)dlsym(handle, "UPnPCreateMediaProfiler");
if (!(error = dlerror())){
isyslog("UPnP\tFound profiler in %s", file.c_str());
+ return true;
}
}