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

fix(sound): sound profile handling improvements

Browse source
This commit is contained in:
Michael Aaron Murphy 2025-07-22 03:02:50 +02:00
parent ec72468b6d
commit d41cdc5dc2
No known key found for this signature in database
GPG key ID: B2732D4240C9212C
4 changed files with 120 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

33
Cargo.lock generated
View file

@ -1519,7 +1519,7 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-config" name = "cosmic-config"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic#7748e59ae6576d93fc8b9594b1e159682e8ab844" source = "git+https://github.com/pop-os/libcosmic//?rev=7748e59#7748e59ae6576d93fc8b9594b1e159682e8ab844"
dependencies = [ dependencies = [
"atomicwrites", "atomicwrites",
"cosmic-config-derive", "cosmic-config-derive",
@ -1541,7 +1541,7 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-config-derive" name = "cosmic-config-derive"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic#7748e59ae6576d93fc8b9594b1e159682e8ab844" source = "git+https://github.com/pop-os/libcosmic//?rev=7748e59#7748e59ae6576d93fc8b9594b1e159682e8ab844"
dependencies = [ dependencies = [
"quote", "quote",
"syn 2.0.104", "syn 2.0.104",
@ -1789,7 +1789,7 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-settings-subscriptions" name = "cosmic-settings-subscriptions"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/cosmic-settings-subscriptions#acdb93c732310d8bb595e4c38a041156bc5467a4" source = "git+https://github.com/pop-os/cosmic-settings-subscriptions#da6ba802b1117f739fb3170aeb654c46fd2f08c3"
dependencies = [ dependencies = [
"bluez-zbus", "bluez-zbus",
"cosmic-dbus-a11y", "cosmic-dbus-a11y",
@ -1810,7 +1810,6 @@ dependencies = [
"tokio", "tokio",
"tokio-stream", "tokio-stream",
"tracing", "tracing",
"upower_dbus",
"zbus 5.9.0", "zbus 5.9.0",
] ]
@ -1872,7 +1871,7 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-theme" name = "cosmic-theme"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic#7748e59ae6576d93fc8b9594b1e159682e8ab844" source = "git+https://github.com/pop-os/libcosmic//?rev=7748e59#7748e59ae6576d93fc8b9594b1e159682e8ab844"
dependencies = [ dependencies = [
"almost", "almost",
"cosmic-config", "cosmic-config",
@ -3264,7 +3263,7 @@ dependencies = [
[[package]] [[package]]
name = "iced" name = "iced"
version = "0.14.0-dev" version = "0.14.0-dev"
source = "git+https://github.com/pop-os/libcosmic#7748e59ae6576d93fc8b9594b1e159682e8ab844" source = "git+https://github.com/pop-os/libcosmic//?rev=7748e59#7748e59ae6576d93fc8b9594b1e159682e8ab844"
dependencies = [ dependencies = [
"dnd", "dnd",
"iced_accessibility", "iced_accessibility",
@ -3282,7 +3281,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_accessibility" name = "iced_accessibility"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic#7748e59ae6576d93fc8b9594b1e159682e8ab844" source = "git+https://github.com/pop-os/libcosmic//?rev=7748e59#7748e59ae6576d93fc8b9594b1e159682e8ab844"
dependencies = [ dependencies = [
"accesskit", "accesskit",
"accesskit_winit", "accesskit_winit",
@ -3291,7 +3290,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_core" name = "iced_core"
version = "0.14.0-dev" version = "0.14.0-dev"
source = "git+https://github.com/pop-os/libcosmic#7748e59ae6576d93fc8b9594b1e159682e8ab844" source = "git+https://github.com/pop-os/libcosmic//?rev=7748e59#7748e59ae6576d93fc8b9594b1e159682e8ab844"
dependencies = [ dependencies = [
"bitflags 2.9.1", "bitflags 2.9.1",
"bytes", "bytes",
@ -3316,7 +3315,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_futures" name = "iced_futures"
version = "0.14.0-dev" version = "0.14.0-dev"
source = "git+https://github.com/pop-os/libcosmic#7748e59ae6576d93fc8b9594b1e159682e8ab844" source = "git+https://github.com/pop-os/libcosmic//?rev=7748e59#7748e59ae6576d93fc8b9594b1e159682e8ab844"
dependencies = [ dependencies = [
"futures", "futures",
"iced_core", "iced_core",
@ -3342,7 +3341,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_graphics" name = "iced_graphics"
version = "0.14.0-dev" version = "0.14.0-dev"
source = "git+https://github.com/pop-os/libcosmic#7748e59ae6576d93fc8b9594b1e159682e8ab844" source = "git+https://github.com/pop-os/libcosmic//?rev=7748e59#7748e59ae6576d93fc8b9594b1e159682e8ab844"
dependencies = [ dependencies = [
"bitflags 2.9.1", "bitflags 2.9.1",
"bytemuck", "bytemuck",
@ -3364,7 +3363,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_renderer" name = "iced_renderer"
version = "0.14.0-dev" version = "0.14.0-dev"
source = "git+https://github.com/pop-os/libcosmic#7748e59ae6576d93fc8b9594b1e159682e8ab844" source = "git+https://github.com/pop-os/libcosmic//?rev=7748e59#7748e59ae6576d93fc8b9594b1e159682e8ab844"
dependencies = [ dependencies = [
"iced_graphics", "iced_graphics",
"iced_tiny_skia", "iced_tiny_skia",
@ -3376,7 +3375,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_runtime" name = "iced_runtime"
version = "0.14.0-dev" version = "0.14.0-dev"
source = "git+https://github.com/pop-os/libcosmic#7748e59ae6576d93fc8b9594b1e159682e8ab844" source = "git+https://github.com/pop-os/libcosmic//?rev=7748e59#7748e59ae6576d93fc8b9594b1e159682e8ab844"
dependencies = [ dependencies = [
"bytes", "bytes",
"cosmic-client-toolkit", "cosmic-client-toolkit",
@ -3392,7 +3391,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_tiny_skia" name = "iced_tiny_skia"
version = "0.14.0-dev" version = "0.14.0-dev"
source = "git+https://github.com/pop-os/libcosmic#7748e59ae6576d93fc8b9594b1e159682e8ab844" source = "git+https://github.com/pop-os/libcosmic//?rev=7748e59#7748e59ae6576d93fc8b9594b1e159682e8ab844"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"cosmic-text", "cosmic-text",
@ -3408,7 +3407,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_wgpu" name = "iced_wgpu"
version = "0.14.0-dev" version = "0.14.0-dev"
source = "git+https://github.com/pop-os/libcosmic#7748e59ae6576d93fc8b9594b1e159682e8ab844" source = "git+https://github.com/pop-os/libcosmic//?rev=7748e59#7748e59ae6576d93fc8b9594b1e159682e8ab844"
dependencies = [ dependencies = [
"as-raw-xcb-connection", "as-raw-xcb-connection",
"bitflags 2.9.1", "bitflags 2.9.1",
@ -3439,7 +3438,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_widget" name = "iced_widget"
version = "0.14.0-dev" version = "0.14.0-dev"
source = "git+https://github.com/pop-os/libcosmic#7748e59ae6576d93fc8b9594b1e159682e8ab844" source = "git+https://github.com/pop-os/libcosmic//?rev=7748e59#7748e59ae6576d93fc8b9594b1e159682e8ab844"
dependencies = [ dependencies = [
"cosmic-client-toolkit", "cosmic-client-toolkit",
"dnd", "dnd",
@ -3459,7 +3458,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_winit" name = "iced_winit"
version = "0.14.0-dev" version = "0.14.0-dev"
source = "git+https://github.com/pop-os/libcosmic#7748e59ae6576d93fc8b9594b1e159682e8ab844" source = "git+https://github.com/pop-os/libcosmic//?rev=7748e59#7748e59ae6576d93fc8b9594b1e159682e8ab844"
dependencies = [ dependencies = [
"cosmic-client-toolkit", "cosmic-client-toolkit",
"dnd", "dnd",
@ -4583,7 +4582,7 @@ checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776"
[[package]] [[package]]
name = "libcosmic" name = "libcosmic"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic#7748e59ae6576d93fc8b9594b1e159682e8ab844" source = "git+https://github.com/pop-os/libcosmic//?rev=7748e59#7748e59ae6576d93fc8b9594b1e159682e8ab844"
dependencies = [ dependencies = [
"apply", "apply",
"ashpd 0.11.0", "ashpd 0.11.0",

20
Cargo.toml
View file

@ -37,13 +37,18 @@ git = "https://github.com/smithay/client-toolkit/"
package = "smithay-client-toolkit" package = "smithay-client-toolkit"
# rev = "c583de8" # rev = "c583de8"
[profile.release-with-debug] [profile.dev]
inherits = "release" opt-level = "s"
debug = true lto = "off"
[profile.release] [profile.release]
opt-level = "s" opt-level = "s"
lto = "thin"
[profile.release-with-debug]
inherits = "release"
lto = "off" lto = "off"
debug = true
# Fix text rendering being cut off on the right # Fix text rendering being cut off on the right
[patch.'https://github.com/pop-os/cosmic-text'] [patch.'https://github.com/pop-os/cosmic-text']
@ -60,10 +65,11 @@ cosmic-client-toolkit = { git = "https://github.com/pop-os/cosmic-protocols//",
# cosmic-settings-config = { git = "https://github.com/pop-os/cosmic-settings-daemon//", branch = "input_nobuild" } # cosmic-settings-config = { git = "https://github.com/pop-os/cosmic-settings-daemon//", branch = "input_nobuild" }
# For development and testing purposes # For development and testing purposes
# [patch.'https://github.com/pop-os/libcosmic'] [patch.'https://github.com/pop-os/libcosmic']
# libcosmic = { git = "https://github.com/pop-os/libcosmic//", branch = "drop-menu-tree-changes" } libcosmic = { git = "https://github.com/pop-os/libcosmic//", rev = "7748e59" }
# cosmic-config = { git = "https://github.com/pop-os/libcosmic//", branch = "drop-menu-tree-changes" } cosmic-config = { git = "https://github.com/pop-os/libcosmic//", rev = "7748e59" }
# cosmic-theme = { git = "https://github.com/pop-os/libcosmic//", branch = "drop-menu-tree-changes" } cosmic-theme = { git = "https://github.com/pop-os/libcosmic//", rev = "7748e59" }
iced_futures = { git = "https://github.com/pop-os/libcosmic//", rev = "7748e59" }
# libcosmic = { path = "../libcosmic" } # libcosmic = { path = "../libcosmic" }
# cosmic-config = { path = "../libcosmic/cosmic-config" } # cosmic-config = { path = "../libcosmic/cosmic-config" }
# cosmic-theme = { path = "../libcosmic/cosmic-theme" } # cosmic-theme = { path = "../libcosmic/cosmic-theme" }

26
cosmic-settings/Cargo.toml
View file

@ -92,15 +92,6 @@ pwhash = "1"
[dependencies.cosmic-settings-subscriptions] [dependencies.cosmic-settings-subscriptions]
git = "https://github.com/pop-os/cosmic-settings-subscriptions" git = "https://github.com/pop-os/cosmic-settings-subscriptions"
#TODO: only select features as needed
features = [
"cosmic_a11y_manager",
"accessibility",
"network_manager",
"pipewire",
"pulse",
"bluetooth",
]
optional = true optional = true
[dependencies.icu] [dependencies.icu]
@ -143,17 +134,19 @@ linux = [
# Pages # Pages
page-accessibility = [ page-accessibility = [
"dep:cosmic-comp-config", "dep:sctk",
"dep:cosmic-protocols", "dep:cosmic-protocols",
"dep:cosmic-comp-config",
"dep:cosmic-settings-config", "dep:cosmic-settings-config",
"dep:cosmic-settings-daemon-config", "dep:cosmic-settings-daemon-config",
"dep:sctk", "cosmic-settings-subscriptions/accessibility",
"cosmic-settings-subscriptions/cosmic_a11y_manager",
] ]
page-about = ["dep:cosmic-settings-system", "dep:hostname1-zbus", "dep:zbus"] page-about = ["dep:cosmic-settings-system", "dep:hostname1-zbus", "dep:zbus"]
page-bluetooth = [ page-bluetooth = [
"dep:bluez-zbus", "cosmic-settings-subscriptions/bluetooth",
"dep:zbus", "dep:zbus",
"dep:cosmic-settings-subscriptions", "dep:bluez-zbus",
] ]
page-date = ["dep:timedate-zbus", "dep:zbus"] page-date = ["dep:timedate-zbus", "dep:zbus"]
page-default-apps = ["dep:cosmic-settings-config", "dep:mime-apps"] page-default-apps = ["dep:cosmic-settings-config", "dep:mime-apps"]
@ -166,14 +159,17 @@ page-input = [
] ]
page-legacy-applications = ["dep:cosmic-comp-config"] page-legacy-applications = ["dep:cosmic-comp-config"]
page-networking = [ page-networking = [
"cosmic-settings-subscriptions/network_manager",
"xdg-portal", "xdg-portal",
"dep:cosmic-dbus-networkmanager", "dep:cosmic-dbus-networkmanager",
"dep:cosmic-settings-subscriptions",
"dep:zbus", "dep:zbus",
] ]
page-power = ["dep:upower_dbus", "dep:zbus"] page-power = ["dep:upower_dbus", "dep:zbus"]
page-region = ["gettext", "dep:locales-rs", "dep:locale1", "dep:zbus"] page-region = ["gettext", "dep:locales-rs", "dep:locale1", "dep:zbus"]
page-sound = ["dep:cosmic-settings-subscriptions"] page-sound = [
"cosmic-settings-subscriptions/pipewire",
"cosmic-settings-subscriptions/pulse",
]
page-users = ["xdg-portal", "dep:accounts-zbus", "dep:zbus", "dep:zbus_polkit"] page-users = ["xdg-portal", "dep:accounts-zbus", "dep:zbus", "dep:zbus_polkit"]
page-window-management = ["dep:cosmic-settings-config"] page-window-management = ["dep:cosmic-settings-config"]
page-workspaces = ["dep:cosmic-comp-config"] page-workspaces = ["dep:cosmic-comp-config"]

134
cosmic-settings/src/pages/sound.rs
View file

@ -81,44 +81,66 @@ pub struct Page {
entity: page::Entity, entity: page::Entity,
pipewire_thread: Option<(tokio::sync::oneshot::Sender<()>, pipewire::Sender<()>)>, pipewire_thread: Option<(tokio::sync::oneshot::Sender<()>, pipewire::Sender<()>)>,
pulse_thread: Option<tokio::sync::oneshot::Sender<()>>, pulse_thread: Option<tokio::sync::oneshot::Sender<()>>,
sink_channels: Option<pulse::PulseChannels>,
devices: BTreeMap<DeviceId, Card>, devices: BTreeMap<DeviceId, Card>,
card_names: IndexMap<DeviceId, String>, card_names: IndexMap<DeviceId, String>,
card_profiles: IndexMap<DeviceId, Vec<pulse::CardProfile>>, card_profiles: IndexMap<DeviceId, Vec<pulse::CardProfile>>,
active_profiles: IndexMap<DeviceId, Option<String>>, active_profiles: IndexMap<DeviceId, Option<String>>,
default_sink: String, /** Sink devices */
default_source: String,
sink_volume: u32,
sink_volume_text: String,
sink_mute: bool,
sink_volume_debounce: bool,
sink_balance: Option<f32>,
sink_balance_text: Option<String>,
sink_balance_debounce: bool,
sink_channels: Option<pulse::PulseChannels>,
source_volume: u32,
source_volume_text: String,
source_mute: bool,
source_volume_debounce: bool,
/// Product names for source sink devices.
sinks: Vec<String>, sinks: Vec<String>,
sink_ids: Vec<NodeId>, /// Pipewire object IDs for sink devices.
sink_pw_ids: Vec<NodeId>,
/// Profile IDs for the actively-selected sink device.
sink_profiles: Vec<String>, sink_profiles: Vec<String>,
/// Names of profiles for the actively-selected sink device.
sink_profile_names: Vec<String>, sink_profile_names: Vec<String>,
sources: Vec<String>, /// Device ID of active sink device.
source_ids: Vec<NodeId>,
source_profiles: Vec<String>,
source_profile_names: Vec<String>,
active_sink: Option<usize>,
active_sink_device: Option<DeviceId>, active_sink_device: Option<DeviceId>,
/// Index of active sink device.
active_sink: Option<usize>,
/// Card profile index of active sink device.
active_sink_profile: Option<usize>, active_sink_profile: Option<usize>,
active_source: Option<usize>,
/** Source devices */
/// Product names for source devices.
sources: Vec<String>,
/// Pipewire object IDs for source devices.
source_pw_ids: Vec<NodeId>,
/// Profile IDs for the actively-selected source device.
source_profiles: Vec<String>,
/// Names of profiles for the actively-selected source device.
source_profile_names: Vec<String>,
/// Device ID of active source device.
active_source_device: Option<DeviceId>, active_source_device: Option<DeviceId>,
/// Index of active source device.
active_source: Option<usize>,
/// Card profile index of active source device.
active_source_profile: Option<usize>, active_source_profile: Option<usize>,
/// Device identifier of the default sink.
default_sink: String,
/// Device identifier of the default source.
default_source: String,
sink_volume_text: String,
source_volume_text: String,
sink_balance_text: Option<String>,
sink_balance: Option<f32>,
sink_volume: u32,
source_volume: u32,
sink_mute: bool,
sink_volume_debounce: bool,
sink_balance_debounce: bool,
source_mute: bool,
source_volume_debounce: bool,
changing_sink_profile: bool, changing_sink_profile: bool,
changing_source_profile: bool, changing_source_profile: bool,
} }
@ -224,8 +246,7 @@ impl Page {
.map_or((Vec::new(), Vec::new()), |profiles| { .map_or((Vec::new(), Vec::new()), |profiles| {
profiles profiles
.iter() .iter()
// TODO: Allow disabling .filter(|p| p.available && p.name != "off")
.filter(|p| p.available && p.description != "Off")
.map(|p| (p.name.clone(), p.description.clone())) .map(|p| (p.name.clone(), p.description.clone()))
.collect() .collect()
}); });
@ -269,7 +290,7 @@ impl Page {
for (&node_id, device) in &card.devices { for (&node_id, device) in &card.devices {
if let pipewire::MediaClass::Sink = device.class { if let pipewire::MediaClass::Sink = device.class {
if device.identifier == self.default_sink { if device.identifier == self.default_sink {
self.active_sink = self.sink_ids.iter().position(|&id| id == node_id); self.active_sink = self.sink_pw_ids.iter().position(|&id| id == node_id);
let device_id = device_id.clone(); let device_id = device_id.clone();
self.set_sink_profiles(&device_id); self.set_sink_profiles(&device_id);
self.active_sink_device = Some(device_id); self.active_sink_device = Some(device_id);
@ -294,7 +315,8 @@ impl Page {
for (&node_id, device) in &card.devices { for (&node_id, device) in &card.devices {
if let pipewire::MediaClass::Source = device.class { if let pipewire::MediaClass::Source = device.class {
if device.identifier == self.default_source { if device.identifier == self.default_source {
self.active_source = self.source_ids.iter().position(|&id| id == node_id); self.active_source =
self.source_pw_ids.iter().position(|&id| id == node_id);
let device_id = device_id.clone(); let device_id = device_id.clone();
self.set_source_profiles(&device_id); self.set_source_profiles(&device_id);
self.active_source_device = Some(device_id); self.active_source_device = Some(device_id);
@ -315,7 +337,7 @@ impl Page {
} }
let mut command = None; let mut command = None;
if let Some(&node_id) = self.source_ids.get(self.active_source.unwrap_or(0)) { if let Some(&node_id) = self.source_pw_ids.get(self.active_source.unwrap_or(0)) {
command = Some(cosmic::task::future(async move { command = Some(cosmic::task::future(async move {
tokio::time::sleep(Duration::from_millis(64)).await; tokio::time::sleep(Duration::from_millis(64)).await;
crate::pages::Message::Sound(Message::SourceVolumeApply(node_id)) crate::pages::Message::Sound(Message::SourceVolumeApply(node_id))
@ -343,7 +365,7 @@ impl Page {
} }
let mut command = None; let mut command = None;
if let Some(&node_id) = self.sink_ids.get(self.active_sink.unwrap_or(0)) { if let Some(&node_id) = self.sink_pw_ids.get(self.active_sink.unwrap_or(0)) {
command = Some(cosmic::task::future(async move { command = Some(cosmic::task::future(async move {
tokio::time::sleep(Duration::from_millis(64)).await; tokio::time::sleep(Duration::from_millis(64)).await;
crate::pages::Message::Sound(Message::SinkVolumeApply(node_id)) crate::pages::Message::Sound(Message::SinkVolumeApply(node_id))
@ -363,7 +385,11 @@ impl Page {
} }
let mut command = None; let mut command = None;
if !self.sink_ids.get(self.active_sink.unwrap_or(0)).is_none() { if !self
.sink_pw_ids
.get(self.active_sink.unwrap_or(0))
.is_none()
{
command = Some(cosmic::task::future(async move { command = Some(cosmic::task::future(async move {
tokio::time::sleep(Duration::from_millis(64)).await; tokio::time::sleep(Duration::from_millis(64)).await;
crate::pages::Message::Sound(Message::SinkBalanceApply) crate::pages::Message::Sound(Message::SinkBalanceApply)
@ -426,28 +452,28 @@ impl Page {
match device.media_class { match device.media_class {
pipewire::MediaClass::Sink => { pipewire::MediaClass::Sink => {
self.sinks.push(device.node_description.clone()); self.sinks.push(device.product_name.clone());
self.sink_ids.push(device.object_id); self.sink_pw_ids.push(device.object_id);
sort_pulse_devices(&mut self.sinks, &mut self.sink_ids);
sort_pulse_devices(&mut self.sinks, &mut self.sink_pw_ids);
if self.default_sink == device.node_name { if self.default_sink == device.node_name {
self.active_sink = self self.active_sink =
.sinks self.sinks.iter().position(|s| *s == device.product_name);
.iter()
.position(|s| *s == device.node_description);
self.active_sink_device = Some(device_id.clone()); self.active_sink_device = Some(device_id.clone());
self.set_sink_profiles(&device_id); self.set_sink_profiles(&device_id);
} }
} }
pipewire::MediaClass::Source => { pipewire::MediaClass::Source => {
self.sources.push(device.node_description.clone()); self.sources.push(device.product_name.clone());
self.source_ids.push(device.object_id); self.source_pw_ids.push(device.object_id);
sort_pulse_devices(&mut self.sources, &mut self.source_ids);
sort_pulse_devices(&mut self.sources, &mut self.source_pw_ids);
if self.default_source == device.node_name { if self.default_source == device.node_name {
self.active_source = self self.active_source =
.sources self.sources.iter().position(|s| *s == device.product_name);
.iter()
.position(|s| *s == device.node_description);
self.active_source_device = Some(device_id.clone()); self.active_source_device = Some(device_id.clone());
self.set_source_profiles(&device_id); self.set_source_profiles(&device_id);
} }
@ -463,7 +489,7 @@ impl Page {
Device { Device {
class: device.media_class, class: device.media_class,
identifier: device.node_name, identifier: device.node_name,
description: device.node_description, description: device.product_name,
}, },
); );
@ -485,16 +511,16 @@ impl Page {
_ = self.devices.remove(&card_id); _ = self.devices.remove(&card_id);
} }
if let Some(pos) = self.sink_ids.iter().position(|&id| id == node_id) { if let Some(pos) = self.sink_pw_ids.iter().position(|&id| id == node_id) {
_ = self.sink_ids.remove(pos); _ = self.sink_pw_ids.remove(pos);
_ = self.sinks.remove(pos); _ = self.sinks.remove(pos);
if self.active_sink == Some(pos) { if self.active_sink == Some(pos) {
self.active_sink = None; self.active_sink = None;
self.active_sink_device = None; self.active_sink_device = None;
self.active_sink_profile = None; self.active_sink_profile = None;
} }
} else if let Some(pos) = self.source_ids.iter().position(|&id| id == node_id) { } else if let Some(pos) = self.source_pw_ids.iter().position(|&id| id == node_id) {
_ = self.source_ids.remove(pos); _ = self.source_pw_ids.remove(pos);
_ = self.sources.remove(pos); _ = self.sources.remove(pos);
if self.active_source == Some(pos) { if self.active_source == Some(pos) {
self.active_source = None; self.active_source = None;
@ -504,7 +530,7 @@ impl Page {
} }
} }
Message::SinkChanged(pos) => { Message::SinkChanged(pos) => {
if let Some(node_id) = self.sink_ids.get(pos) { if let Some(node_id) = self.sink_pw_ids.get(pos) {
for card in self.devices.values() { for card in self.devices.values() {
for (nid, device) in &card.devices { for (nid, device) in &card.devices {
if node_id == nid { if node_id == nid {
@ -518,7 +544,7 @@ impl Page {
} }
} }
Message::SourceChanged(pos) => { Message::SourceChanged(pos) => {
if let Some(node_id) = self.source_ids.get(pos) { if let Some(node_id) = self.source_pw_ids.get(pos) {
for card in self.devices.values() { for card in self.devices.values() {
for (nid, device) in &card.devices { for (nid, device) in &card.devices {
if node_id == nid { if node_id == nid {
@ -551,13 +577,13 @@ impl Page {
} }
Message::SinkMuteToggle => { Message::SinkMuteToggle => {
self.sink_mute = !self.sink_mute; self.sink_mute = !self.sink_mute;
if let Some(&node_id) = self.sink_ids.get(self.active_sink.unwrap_or(0)) { if let Some(&node_id) = self.sink_pw_ids.get(self.active_sink.unwrap_or(0)) {
wpctl_set_mute(node_id, self.sink_mute); wpctl_set_mute(node_id, self.sink_mute);
} }
} }
Message::SourceMuteToggle => { Message::SourceMuteToggle => {
self.source_mute = !self.source_mute; self.source_mute = !self.source_mute;
if let Some(&node_id) = self.source_ids.get(self.active_source.unwrap_or(0)) { if let Some(&node_id) = self.source_pw_ids.get(self.active_source.unwrap_or(0)) {
wpctl_set_mute(node_id, self.source_mute); wpctl_set_mute(node_id, self.source_mute);
} }
} }