changelog/next.md

@@ -36,7 +36,6 @@ set shell id.
 
 - Fixed volume control breaking with pipewire pro audio mode.
 - Fixed volume control breaking with bluez streams and potentially others.
-- Fixed volume control breaking for devices without route definitions.
 - Fixed escape sequence handling in desktop entries.
 - Fixed volumes not initializing if a pipewire device was already loaded before its node.
 - Fixed hyprland active toplevel not resetting after window closes.

src/core/scanenv.cpp

@@ -1,7 +1,6 @@
 #include "scanenv.hpp"
 
 #include <qcontainerfwd.h>
-#include <qtenvironmentvariables.h>
 
 #include "build.hpp"
 
@@ -20,12 +19,4 @@ bool PreprocEnv::hasVersion(int major, int minor, const QStringList& features) {
 	return QS_VERSION_MAJOR == major && QS_VERSION_MINOR == minor;
 }
 
-QString PreprocEnv::env(const QString& variable) {
-	return qEnvironmentVariable(variable.toStdString().c_str());
-}
-
-bool PreprocEnv::isEnvSet(const QString& variable) {
-	return qEnvironmentVariableIsSet(variable.toStdString().c_str());
-}
-
 } // namespace qs::scan::env

src/core/scanenv.hpp

@@ -12,9 +12,6 @@ class PreprocEnv: public QObject {
 public:
 	Q_INVOKABLE static bool
 	hasVersion(int major, int minor, const QStringList& features = QStringList());
-
-	Q_INVOKABLE static QString env(const QString& variable);
-	Q_INVOKABLE static bool isEnvSet(const QString& variable);
 };
 
 } // namespace qs::scan::env

src/services/pipewire/device.cpp

@@ -141,10 +141,6 @@ bool PwDevice::tryLoadVolumeProps(qint32 routeDevice, PwVolumeProps& volumeProps
 	return true;
 }
 
-bool PwDevice::hasRouteDevice(qint32 routeDevice) const {
-	return this->routeDeviceIndexes.contains(routeDevice);
-}
-
 void PwDevice::polled() {
 	// It is far more likely that the list content has not come in yet than it having no entries,
 	// and there isn't a way to check in the case that there *aren't* actually any entries.

src/services/pipewire/device.hpp

@@ -12,15 +12,13 @@
 #include <spa/pod/builder.h>
 
 #include "core.hpp"
+#include "node.hpp"
 #include "registry.hpp"
 
 namespace qs::service::pipewire {
 
 class PwDevice;
 
-// Forward declare to avoid circular dependency with node.hpp
-struct PwVolumeProps;
-
 class PwDevice: public PwBindable<pw_device, PW_TYPE_INTERFACE_Device, PW_VERSION_DEVICE> {
 	Q_OBJECT;
 
@@ -35,7 +33,6 @@ public:
 	[[nodiscard]] bool waitingForDevice() const;
 
 	[[nodiscard]] bool tryLoadVolumeProps(qint32 routeDevice, PwVolumeProps& volumeProps);
-	[[nodiscard]] bool hasRouteDevice(qint32 routeDevice) const;
 
 signals:
 	void deviceReady();

src/services/pipewire/node.cpp

@@ -429,10 +429,6 @@ void PwNodeBoundAudio::setMuted(bool muted) {
 }
 
 float PwNodeBoundAudio::averageVolume() const {
-	if (this->mVolumes.isEmpty()) {
-		return 0.0f;
-	}
-
 	float total = 0;
 
 	for (auto volume: this->mVolumes) {
@@ -576,28 +572,22 @@ PwVolumeProps PwVolumeProps::parseSpaPod(const spa_pod* param) {
 	const auto* muteProp = spa_pod_find_prop(param, nullptr, SPA_PROP_mute);
 	const auto* volumeStepProp = spa_pod_find_prop(param, nullptr, SPA_PROP_volumeStep);
 
-	if (volumesProp) {
+	const auto* volumes = reinterpret_cast<const spa_pod_array*>(&volumesProp->value);
-		const auto* volumes = reinterpret_cast<const spa_pod_array*>(&volumesProp->value);
+	const auto* channels = reinterpret_cast<const spa_pod_array*>(&channelsProp->value);
-		spa_pod* iter = nullptr;
+
-		SPA_POD_ARRAY_FOREACH(volumes, iter) {
+	spa_pod* iter = nullptr;
-			// Cubing behavior found in MPD source, and appears to corrospond to everyone else's measurements correctly.
+	SPA_POD_ARRAY_FOREACH(volumes, iter) {
-			auto linear = *reinterpret_cast<float*>(iter);
+		// Cubing behavior found in MPD source, and appears to corrospond to everyone else's measurements correctly.
-			auto visual = std::cbrt(linear);
+		auto linear = *reinterpret_cast<float*>(iter);
-			props.volumes.push_back(visual);
+		auto visual = std::cbrt(linear);
-		}
+		props.volumes.push_back(visual);
 	}
 
-	if (channelsProp) {
+	SPA_POD_ARRAY_FOREACH(channels, iter) {
-		const auto* channels = reinterpret_cast<const spa_pod_array*>(&channelsProp->value);
+		props.channels.push_back(*reinterpret_cast<PwAudioChannel::Enum*>(iter));
-		spa_pod* iter = nullptr;
-		SPA_POD_ARRAY_FOREACH(channels, iter) {
-			props.channels.push_back(*reinterpret_cast<PwAudioChannel::Enum*>(iter));
-		}
 	}
 
-	if (muteProp) {
+	spa_pod_get_bool(&muteProp->value, &props.mute);
-		spa_pod_get_bool(&muteProp->value, &props.mute);
-	}
 
 	if (volumeStepProp) {
 		spa_pod_get_float(&volumeStepProp->value, &props.volumeStep);

src/services/pipewire/node.hpp

@@ -15,7 +15,6 @@
 #include <spa/pod/pod.h>
 
 #include "core.hpp"
-#include "device.hpp"
 #include "registry.hpp"
 
 namespace qs::service::pipewire {
@@ -250,9 +249,7 @@ public:
 	bool proAudio = false;
 
 	[[nodiscard]] bool shouldUseDevice() const {
-		if (!this->device || this->proAudio || this->routeDevice == -1) return false;
+		return this->device && !this->proAudio && this->routeDevice != -1;
-		// Only use device control if the device actually has route indexes for this routeDevice
-		return this->device->hasRouteDevice(this->routeDevice);
 	}
 
 signals: