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

services/pipewire: update volume props from device for device nodes

Browse source 
Yet another device node edge case. In addition to only writing via
a pw_device when present, now we only read from one as well.

This fixes missing state changes not conveyed by the pw_node.

Fixes #35
This commit is contained in:
outfoxxed 2025-06-19 05:12:24 -07:00
parent 579d589290
commit 95d0af8113
Signed by untrusted user: outfoxxed
GPG key ID: 4C88A185FB89301E
5 changed files with 61 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -255,6 +255,13 @@ void PwNode::onParam(
PwNodeBoundAudio::PwNodeBoundAudio(PwNode* node): node(node) {
if (node->device) {
QObject::connect(node->device, &PwDevice::deviceReady, this, &PwNodeBoundAudio::onDeviceReady);
QObject::connect(
node->device,
&PwDevice::routeVolumesChanged,
this,
&PwNodeBoundAudio::onDeviceVolumesChanged
);
}
}
@ -278,13 +285,17 @@ void PwNodeBoundAudio::onInfo(const pw_node_info* info) {
void PwNodeBoundAudio::onSpaParam(quint32 id, quint32 index, const spa_pod* param) {
if (id == SPA_PARAM_Props && index == 0) {
this->updateVolumeProps(param);
if (this->node->device) {
qCDebug(logNode) << "Skipping node volume props update for" << this->node
<< "in favor of device updates.";
return;
}
this->updateVolumeProps(PwVolumeProps::parseSpaPod(param));
}
}
void PwNodeBoundAudio::updateVolumeProps(const spa_pod* param) {
auto volumeProps = PwVolumeProps::parseSpaPod(param);
void PwNodeBoundAudio::updateVolumeProps(const PwVolumeProps& volumeProps) {
if (volumeProps.volumes.size() != volumeProps.channels.size()) {
qCWarning(logNode) << "Cannot update volume props of" << this->node
<< "- channelVolumes and channelMap are not the same size. Sizes:"
@ -489,6 +500,18 @@ void PwNodeBoundAudio::onDeviceReady() {
}
}
void PwNodeBoundAudio::onDeviceVolumesChanged(
qint32 routeDevice,
const PwVolumeProps& volumeProps
) {
if (this->node->device && this->node->routeDevice == routeDevice) {
qCDebug(logNode) << "Got updated device volume props for" << this->node << "via"
<< this->node->device;
this->updateVolumeProps(volumeProps);
}
}
PwVolumeProps PwVolumeProps::parseSpaPod(const spa_pod* param) {
auto props = PwVolumeProps();