quickshell/quickshell
1
1
Fork 2
Code Issues Wiki Activity

core/log: track default logging categories

Browse source 
Fixes a bug in fb37be7 which ignored default logging categories due to
skipping QLoggingRegistry's filter.
This commit is contained in:
outfoxxed 2025-07-08 13:39:34 -07:00
parent 5d7e07508a
commit 3d594e16dd
Signed by: outfoxxed
GPG key ID: 4C88A185FB89301E
68 changed files with 212 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/services/pipewire/core.cpp
View file

@ -14,10 +14,12 @@
#include <spa/utils/defs.h>
#include <spa/utils/hook.h>
#include "../../core/logcat.hpp"
namespace qs::service::pipewire {
namespace {
Q_LOGGING_CATEGORY(logLoop, "quickshell.service.pipewire.loop", QtWarningMsg);
QS_LOGGING_CATEGORY(logLoop, "quickshell.service.pipewire.loop", QtWarningMsg);
}
const pw_core_events PwCore::EVENTS = {

3
src/services/pipewire/defaults.cpp
View file

@ -11,6 +11,7 @@
#include <qtmetamacros.h>
#include <spa/utils/json.h>
#include "../../core/logcat.hpp"
#include "../../core/util.hpp"
#include "metadata.hpp"
#include "node.hpp"
@ -22,7 +23,7 @@ struct spa_json;
namespace qs::service::pipewire {
namespace {
Q_LOGGING_CATEGORY(logDefaults, "quickshell.service.pipewire.defaults", QtWarningMsg);
QS_LOGGING_CATEGORY(logDefaults, "quickshell.service.pipewire.defaults", QtWarningMsg);
}
PwDefaultTracker::PwDefaultTracker(PwRegistry* registry): registry(registry) {

3
src/services/pipewire/device.cpp
View file

@ -20,13 +20,14 @@
#include <spa/pod/vararg.h>
#include <spa/utils/type.h>
#include "../../core/logcat.hpp"
#include "core.hpp"
#include "node.hpp"
namespace qs::service::pipewire {
namespace {
Q_LOGGING_CATEGORY(logDevice, "quickshell.service.pipewire.device", QtWarningMsg);
QS_LOGGING_CATEGORY(logDevice, "quickshell.service.pipewire.device", QtWarningMsg);
}
// https://github.com/PipeWire/wireplumber/blob/895c1c7286e8809fad869059179e53ab39c807e9/modules/module-mixer-api.c#L397

3
src/services/pipewire/link.cpp
View file

@ -10,12 +10,13 @@
#include <qtypes.h>
#include <spa/utils/dict.h>
#include "../../core/logcat.hpp"
#include "registry.hpp"
namespace qs::service::pipewire {
namespace {
Q_LOGGING_CATEGORY(logLink, "quickshell.service.pipewire.link", QtWarningMsg);
QS_LOGGING_CATEGORY(logLink, "quickshell.service.pipewire.link", QtWarningMsg);
}
QString PwLinkState::toString(Enum value) {

3
src/services/pipewire/metadata.cpp
View file

@ -11,12 +11,13 @@
#include <qtypes.h>
#include <spa/utils/dict.h>
#include "../../core/logcat.hpp"
#include "registry.hpp"
namespace qs::service::pipewire {
namespace {
Q_LOGGING_CATEGORY(logMeta, "quickshell.service.pipewire.metadata", QtWarningMsg);
QS_LOGGING_CATEGORY(logMeta, "quickshell.service.pipewire.metadata", QtWarningMsg);
}
void PwMetadata::bindHooks() {

3
src/services/pipewire/node.cpp
View file

@ -25,6 +25,7 @@
#include <spa/utils/keys.h>
#include <spa/utils/type.h>
#include "../../core/logcat.hpp"
#include "connection.hpp"
#include "core.hpp"
#include "device.hpp"
@ -32,7 +33,7 @@
namespace qs::service::pipewire {
namespace {
Q_LOGGING_CATEGORY(logNode, "quickshell.service.pipewire.node", QtWarningMsg);
QS_LOGGING_CATEGORY(logNode, "quickshell.service.pipewire.node", QtWarningMsg);
}
QString PwAudioChannel::toString(Enum value) {

3
src/services/pipewire/registry.cpp
View file

@ -15,6 +15,7 @@
#include <qtmetamacros.h>
#include <qtypes.h>
#include "../../core/logcat.hpp"
#include "core.hpp"
#include "device.hpp"
#include "link.hpp"
@ -23,7 +24,7 @@
namespace qs::service::pipewire {
Q_LOGGING_CATEGORY(logRegistry, "quickshell.service.pipewire.registry", QtWarningMsg);
QS_LOGGING_CATEGORY(logRegistry, "quickshell.service.pipewire.registry", QtWarningMsg);
PwBindableObject::~PwBindableObject() {
if (this->id != 0) {

3
src/services/pipewire/registry.hpp
View file

@ -12,12 +12,13 @@
#include <qtmetamacros.h>
#include <qtypes.h>
#include "../../core/logcat.hpp"
#include "../../core/util.hpp"
#include "core.hpp"
namespace qs::service::pipewire {
Q_DECLARE_LOGGING_CATEGORY(logRegistry);
QS_DECLARE_LOGGING_CATEGORY(logRegistry);
class PwRegistry;
class PwMetadata;