diff options
| author | methodus <methodus@web.de> | 2012-10-02 02:52:14 +0200 |
|---|---|---|
| committer | methodus <methodus@web.de> | 2012-10-02 02:52:14 +0200 |
| commit | cbef7cfb972c27251ea8d58dde054b7c57e1715f (patch) | |
| tree | 090f5c5e45ba29fcaa146da9513d408e895139b5 /media | |
| parent | b2d514992fd66335bf2ea8debb2a2d1476b27419 (diff) | |
| download | vdr-plugin-upnp-cbef7cfb972c27251ea8d58dde054b7c57e1715f.tar.gz vdr-plugin-upnp-cbef7cfb972c27251ea8d58dde054b7c57e1715f.tar.bz2 | |
VDRProvider plugin for serving live tv started.
Diffstat (limited to 'media')
| -rw-r--r-- | media/mediaManager.cpp | 3 | ||||
| -rw-r--r-- | media/pluginManager.cpp | 14 |
2 files changed, 12 insertions, 5 deletions
diff --git a/media/mediaManager.cpp b/media/mediaManager.cpp index e8ee505..a94b563 100644 --- a/media/mediaManager.cpp +++ b/media/mediaManager.cpp @@ -5,13 +5,14 @@ * Author: savop */ -#include "../include/plugin.h" #include "../include/media/mediaManager.h" +#include "../include/plugin.h" #include "../include/server.h" #include "../include/parser.h" #include "../include/tools.h" #include <upnp/upnp.h> #include <sstream> +#include <tntdb/connection.h> #include <tntdb/statement.h> #include <tntdb/result.h> #include <upnp/ixml.h> diff --git a/media/pluginManager.cpp b/media/pluginManager.cpp index b35cd49..40a0b9f 100644 --- a/media/pluginManager.cpp +++ b/media/pluginManager.cpp @@ -259,7 +259,7 @@ upnp::cPluginManager::cPluginManager(cMediaManager* manager) : manager(manager) {} -upnp::cPluginManager::~cPluginManager(){} +cPluginManager::~cPluginManager(){} #define UPNPPLUGIN_PREFIX "libupnp-" #define SO_INDICATOR ".so." @@ -282,7 +282,7 @@ bool upnp::cPluginManager::LoadPlugins(const string& directory){ filename.find(UPNPPLUGIN_VERSION) != string::npos && filename.find(SO_INDICATOR) != string::npos) { - boost::shared_ptr<DLL> dll(new DLL(filename)); + boost::shared_ptr<DLL> dll(new DLL(directory + "/" + filename)); if(dll->Load()) dlls.push_back(dll); } @@ -313,15 +313,23 @@ bool upnp::cPluginManager::DLL::Load(){ if (!(error = dlerror())){ isyslog("UPnP\tFound provider in %s", file.c_str()); return true; + } else { + dsyslog("UPnP\tError: %s", error); } profiler = (FunctionPtr)dlsym(handle, "UPnPCreateMediaProfiler"); if (!(error = dlerror())){ isyslog("UPnP\tFound profiler in %s", file.c_str()); return true; + } else { + dsyslog("UPnP\tError: %s", error); } + } else { + dsyslog("UPnP\tError: %s", error); } + isyslog("UPnP\tInvalid library '%s', no valid symbols found.", file.c_str()); + return false; } @@ -332,5 +340,3 @@ upnp::cPluginManager::DLL::~DLL() } } // namespace upnp - - |