leyoda/cosmic-settings
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(sound): Use crate feature to disable auto-profile on init by default

Browse source 
Adds `auto-profile-init` feature to the subscription crate and then
adds it to cosmic-settings' import. When updating the applet, this
feature will be disabled by default.

Also makes a change to not auto-set the Off profile in case pipewire
reports the profile to be `Off`.
This commit is contained in:
Michael Aaron Murphy 2025-12-04 16:19:54 +01:00 • committed by Michael Murphy
parent 62c16c0495
commit 107f19b03e
3 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cosmic-settings/Cargo.toml
View file

@ -31,7 +31,7 @@ cosmic-settings-airplane-mode-subscription = { path = "../subscriptions/airplane
cosmic-settings-bluetooth-subscription = { path = "../subscriptions/bluetooth", optional = true } cosmic-settings-bluetooth-subscription = { path = "../subscriptions/bluetooth", optional = true }
cosmic-settings-network-manager-subscription = { path = "../subscriptions/network-manager", optional = true } cosmic-settings-network-manager-subscription = { path = "../subscriptions/network-manager", optional = true }
cosmic-settings-upower-subscription = { path = "../subscriptions/upower", optional = true } cosmic-settings-upower-subscription = { path = "../subscriptions/upower", optional = true }
cosmic-settings-sound-subscription = { path = "../subscriptions/sound", optional = true } cosmic-settings-sound-subscription = { path = "../subscriptions/sound", optional = true, features = ["auto-profile-init"] }
cosmic-settings-system = { path = "../pages/system", optional = true } cosmic-settings-system = { path = "../pages/system", optional = true }
cosmic-settings-wallpaper = { path = "../pages/wallpapers" } cosmic-settings-wallpaper = { path = "../pages/wallpapers" }
cosmic-settings-daemon-config = { git = "https://github.com/pop-os/cosmic-settings-daemon", optional = true } cosmic-settings-daemon-config = { git = "https://github.com/pop-os/cosmic-settings-daemon", optional = true }

4
subscriptions/sound/Cargo.toml
View file

@ -16,3 +16,7 @@ numtoa = "1.0.0-alpha1"
rustix = "1.0.8" rustix = "1.0.8"
tokio = { version = "1.47.1", features = ["process", "rt", "time"] } tokio = { version = "1.47.1", features = ["process", "rt", "time"] }
tracing = { version = "0.1.41", default-features = false } tracing = { version = "0.1.41", default-features = false }
[features]
# Set profile on first load
auto-profile-init = []

18
subscriptions/sound/src/lib.rs
View file

@ -441,7 +441,6 @@ impl Model {
profile.description profile.description
); );
let index = profile.index as u32;
let prev = self.active_profiles.insert(id, profile.clone()); let prev = self.active_profiles.insert(id, profile.clone());
self.update_ui_profiles(); self.update_ui_profiles();
if let Some(prev) = prev { if let Some(prev) = prev {
@ -455,14 +454,17 @@ impl Model {
prev.index, profile.index, profile.description prev.index, profile.index, profile.description
); );
} else { } else {
// Use pw-cli to reset the profile in case wireplumber has invalid state. #[cfg(feature = "auto-profile-init")]
// Profiles set by us do not need to use this. if profile.index != 0 {
tracing::debug!( // Use pw-cli to re-set the profile in case wireplumber has invalid state.
target: "sound", // Profiles set by us do not need to use this. Only sets if profile is not `Off`.
"Device {id} initialized with profile {}: {}", index, profile.description tracing::debug!(
); target: "sound",
"Device {id} initialized with profile {}: {}", profile.index, profile.description
);
self.set_profile(id, index, false); self.set_profile(id, profile.index as u32, false);
}
} }
} }