From a98ba2ecfa3e66ae1c6ec606e7005801e4d459e5 Mon Sep 17 00:00:00 2001 From: DaveTBlake Date: Sun, 6 Oct 2019 09:34:59 +0100 Subject: Reduce log spam produced by AnnouncementManager announcing --- addons/resource.language.en_gb/resources/strings.po | 6 ++++++ xbmc/commons/ilog.h | 1 + xbmc/interfaces/AnnouncementManager.cpp | 2 +- xbmc/settings/AdvancedSettings.cpp | 1 + xbmc/windows/GUIWindowHome.cpp | 2 +- 5 files changed, 10 insertions(+), 2 deletions(-) diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po index 9c9161a993..07a6646614 100644 --- a/addons/resource.language.en_gb/resources/strings.po +++ b/addons/resource.language.en_gb/resources/strings.po @@ -21703,3 +21703,9 @@ msgstr "" msgctxt "#39116" msgid "Episode plot" msgstr "" + +#. Label for component level debug logging setting +#: xbmc/settings/AdvancedSettings.cpp +msgctxt "#39117" +msgid "Verbose logging for the [B]Announcer[/B] component" +msgstr "" diff --git a/xbmc/commons/ilog.h b/xbmc/commons/ilog.h index 2fe54560e9..a4e14efafe 100644 --- a/xbmc/commons/ilog.h +++ b/xbmc/commons/ilog.h @@ -44,6 +44,7 @@ #define LOGWINDOWING (1 << (LOGMASKBIT + 14)) #define LOGPVR (1 << (LOGMASKBIT + 15)) #define LOGEPG (1 << (LOGMASKBIT + 16)) +#define LOGANNOUNCE (1 << (LOGMASKBIT + 17)) #include "utils/params_check_macros.h" diff --git a/xbmc/interfaces/AnnouncementManager.cpp b/xbmc/interfaces/AnnouncementManager.cpp index 9eb6ba6e53..b6f53b8144 100644 --- a/xbmc/interfaces/AnnouncementManager.cpp +++ b/xbmc/interfaces/AnnouncementManager.cpp @@ -108,7 +108,7 @@ void CAnnouncementManager::Announce(AnnouncementFlag flag, const char *sender, c void CAnnouncementManager::DoAnnounce(AnnouncementFlag flag, const char *sender, const char *message, const CVariant &data) { - CLog::Log(LOGDEBUG, "CAnnouncementManager - Announcement: %s from %s", message, sender); + CLog::Log(LOGDEBUG, LOGANNOUNCE, "CAnnouncementManager - Announcement: {} from {}", message, sender); CSingleLock lock(m_announcersCritSection); diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp index 8a2442f0bb..9880841892 100644 --- a/xbmc/settings/AdvancedSettings.cpp +++ b/xbmc/settings/AdvancedSettings.cpp @@ -1451,6 +1451,7 @@ void CAdvancedSettings::SettingOptionsLoggingComponentsFiller(SettingConstPtr se list.push_back(std::make_pair(g_localizeStrings.Get(684), LOGWINDOWING)); list.push_back(std::make_pair(g_localizeStrings.Get(685), LOGPVR)); list.push_back(std::make_pair(g_localizeStrings.Get(686), LOGEPG)); + list.emplace_back(g_localizeStrings.Get(39117), LOGANNOUNCE); #ifdef HAS_DBUS list.push_back(std::make_pair(g_localizeStrings.Get(674), LOGDBUS)); #endif diff --git a/xbmc/windows/GUIWindowHome.cpp b/xbmc/windows/GUIWindowHome.cpp index 2eb929fad9..d171ca10e3 100644 --- a/xbmc/windows/GUIWindowHome.cpp +++ b/xbmc/windows/GUIWindowHome.cpp @@ -64,7 +64,7 @@ void CGUIWindowHome::Announce(ANNOUNCEMENT::AnnouncementFlag flag, const char *s { int ra_flag = 0; - CLog::Log(LOGDEBUG, "GOT ANNOUNCEMENT, type: %i, from %s, message %s",(int)flag, sender, message); + CLog::Log(LOGDEBUG, LOGANNOUNCE, "GOT ANNOUNCEMENT, type: {}, from {}, message {}", flag, sender, message); // we are only interested in library changes if ((flag & (ANNOUNCEMENT::VideoLibrary | ANNOUNCEMENT::AudioLibrary)) == 0) -- cgit v1.2.3