msgid "Verbose logging for AirTunes library"
msgstr ""
-#empty strings from id 678 to 699
+#: xbmc/settings/AdvancedSettings.cpp
+msgctxt "#678"
+msgid "Verbose logging for UPnP components"
+msgstr ""
+
+#empty strings from id 679 to 699
msgctxt "#700"
msgid "Cleaning up library"
#define LOGJSONRPC (1 << (LOGMASKBIT + 6))
#define LOGAUDIO (1 << (LOGMASKBIT + 7))
#define LOGAIRTUNES (1 << (LOGMASKBIT + 8))
+#define LOGUPNP (1 << (LOGMASKBIT + 9))
#ifdef __GNUC__
#define ATTRIB_LOG_FORMAT __attribute__((format(printf,3,4)))
#include "utils/log.h"
#include "URL.h"
#include "profiles/ProfilesManager.h"
+#include "settings/AdvancedSettings.h"
#include "settings/Settings.h"
#include "GUIUserMessages.h"
#include "FileItem.h"
| NPT_Console::Output
+---------------------------------------------------------------------*/
void
-NPT_Console::Output(const char* message)
+NPT_Console::Output(const char* msg) { }
+
+void
+UPnPLogger(const NPT_LogRecord* record)
{
- CLog::Log(LOGDEBUG, "%s", message);
+ if (!g_advancedSettings.CanLogComponent(LOGUPNP))
+ return;
+
+ CLog::Log((record->m_Level / 100) - 1, "Platinum [%s]: %s", record->m_LoggerName, record->m_Message);
}
namespace UPNP
CUPnP::CUPnP() :
m_MediaBrowser(NULL),
m_MediaController(NULL),
+ m_LogHandler(NULL),
m_ServerHolder(new CDeviceHostReferenceHolder()),
m_RendererHolder(new CRendererReferenceHolder()),
m_CtrlPointHolder(new CCtrlPointReferenceHolder())
{
+ NPT_LogManager::GetDefault().Configure("plist:.level=FINE;.handlers=CustomHandler;");
+ NPT_LogHandler::Create("CustomHandler", "xbmc", m_LogHandler);
+ m_LogHandler->SetCustomHandlerFunction(&UPnPLogger);
+
// initialize upnp context
m_UPnP = new PLT_UPnP();
StopServer();
delete m_UPnP;
+ delete m_LogHandler;
delete m_ServerHolder;
delete m_RendererHolder;
delete m_CtrlPointHolder;
#include "utils/StdString.h"
+class NPT_LogHandler;
class PLT_UPnP;
class PLT_SyncMediaBrowser;
class PLT_MediaController;
private:
CStdString m_IP;
PLT_UPnP* m_UPnP;
+ NPT_LogHandler* m_LogHandler;
CDeviceHostReferenceHolder* m_ServerHolder;
CRendererReferenceHolder* m_RendererHolder;
CCtrlPointReferenceHolder* m_CtrlPointHolder;
#include "playlists/PlayList.h"
#include "GUIUserMessages.h"
+NPT_SET_LOCAL_LOGGER("xbmc.upnp.renderer")
+
using namespace ANNOUNCEMENT;
namespace UPNP
#include "xbmc/GUIUserMessages.h"
#include "utils/FileUtils.h"
+NPT_SET_LOCAL_LOGGER("xbmc.upnp.server")
+
using namespace std;
using namespace ANNOUNCEMENT;
using namespace XFILE;
#ifdef HAS_AIRTUNES
list.push_back(std::make_pair(g_localizeStrings.Get(677), LOGAIRTUNES));
#endif
+#ifdef HAS_UPNP
+ list.push_back(std::make_pair(g_localizeStrings.Get(678), LOGUPNP));
+#endif
}
void CAdvancedSettings::setExtraLogLevel(const std::vector<CVariant> &components)