kosslan/quickshell
1
0
Fork 0
forked from quickshell/quickshell
Code Pull requests Activity

service/pipewire: don't use configured default devices

Browse source 
These don't appear to be intended for use by applications, only the
non configured ones.

This fixes the default device being unset on many computers and the
device being lost on actions like headphone unplug which replace it.
This commit is contained in:
outfoxxed 2024-09-17 23:04:06 -07:00
parent bd8978375b
commit 931aca5392
Signed by: outfoxxed
GPG key ID: 4C88A185FB89301E
2 changed files with 4 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -70,22 +70,11 @@ void PwDefaultsMetadata::onMetadataUpdate(
) { ) {
if (subject != 0) return; if (subject != 0) return;
// non "configured" sinks and sources have lower priority as wireplumber seems to only change if (strcmp(key, "default.audio.sink") == 0) {
// the "configured" ones.
bool sink = false;
if (strcmp(key, "default.configured.audio.sink") == 0) {
sink = true;
this->sinkConfigured = true;
} else if ((!this->sinkConfigured && strcmp(key, "default.audio.sink") == 0)) {
sink = true;
}
if (sink) {
this->defaultSinkHolder.setObject(metadata); this->defaultSinkHolder.setObject(metadata);
auto newSink = PwDefaultsMetadata::parseNameSpaJson(value); auto newSink = PwDefaultsMetadata::parseNameSpaJson(value);
qCInfo(logMeta) << "Got default sink" << newSink << "configured:" << this->sinkConfigured; qCInfo(logMeta) << "Got default sink" << newSink;
if (newSink == this->mDefaultSink) return; if (newSink == this->mDefaultSink) return;
this->mDefaultSink = newSink; this->mDefaultSink = newSink;
@ -93,19 +82,11 @@ void PwDefaultsMetadata::onMetadataUpdate(
return; return;
} }
bool source = false; if (strcmp(key, "default.audio.source") == 0) {
if (strcmp(key, "default.configured.audio.source") == 0) {
source = true;
this->sourceConfigured = true;
} else if ((!this->sourceConfigured && strcmp(key, "default.audio.source") == 0)) {
source = true;
}
if (source) {
this->defaultSourceHolder.setObject(metadata); this->defaultSourceHolder.setObject(metadata);
auto newSource = PwDefaultsMetadata::parseNameSpaJson(value); auto newSource = PwDefaultsMetadata::parseNameSpaJson(value);
qCInfo(logMeta) << "Got default source" << newSource << "configured:" << this->sourceConfigured; qCInfo(logMeta) << "Got default source" << newSource;
if (newSource == this->mDefaultSource) return; if (newSource == this->mDefaultSource) return;
this->mDefaultSource = newSource; this->mDefaultSource = newSource;

2
src/services/pipewire/metadata.hpp
View file

@ -55,9 +55,7 @@ private:
PwBindableRef<PwMetadata> defaultSinkHolder; PwBindableRef<PwMetadata> defaultSinkHolder;
PwBindableRef<PwMetadata> defaultSourceHolder; PwBindableRef<PwMetadata> defaultSourceHolder;
bool sinkConfigured = false;
QString mDefaultSink; QString mDefaultSink;
bool sourceConfigured = false;
QString mDefaultSource; QString mDefaultSource;
}; };