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

fix(sound): fix sound profiles & move logic to cosmic-settings-subscriptions

Browse source
This commit is contained in:
Michael Aaron Murphy 2025-08-04 17:24:38 +02:00
parent 47f46ba9cd
commit 9a9ecd77bd
No known key found for this signature in database
GPG key ID: B2732D4240C9212C
3 changed files with 130 additions and 126 deletions
Download patch file Download diff file Expand all files Collapse all files

244
Cargo.lock generated
View file

@ -381,7 +381,7 @@ dependencies = [
"enumflags2", "enumflags2",
"futures-channel", "futures-channel",
"futures-util", "futures-util",
"rand 0.9.2", "rand 0.9.1",
"raw-window-handle", "raw-window-handle",
"serde", "serde",
"serde_repr", "serde_repr",
@ -483,9 +483,9 @@ dependencies = [
[[package]] [[package]]
name = "async-io" name = "async-io"
version = "2.5.0" version = "2.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "19634d6336019ef220f09fd31168ce5c184b295cbf80345437cc36094ef223ca" checksum = "1237c0ae75a0f3765f58910ff9cdd0a12eeb39ab2f4c7de23262f337f0aacbb3"
dependencies = [ dependencies = [
"async-lock 3.4.0", "async-lock 3.4.0",
"cfg-if", "cfg-if",
@ -493,10 +493,11 @@ dependencies = [
"futures-io", "futures-io",
"futures-lite 2.6.0", "futures-lite 2.6.0",
"parking", "parking",
"polling 3.9.0", "polling 3.8.0",
"rustix 1.0.8", "rustix 1.0.8",
"slab", "slab",
"windows-sys 0.60.2", "tracing",
"windows-sys 0.59.0",
] ]
[[package]] [[package]]
@ -538,12 +539,12 @@ dependencies = [
[[package]] [[package]]
name = "async-process" name = "async-process"
version = "2.4.0" version = "2.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "65daa13722ad51e6ab1a1b9c01299142bc75135b337923cfa10e79bbbd669f00" checksum = "cde3f4e40e6021d7acffc90095cbd6dc54cb593903d1de5832f435eb274b85dc"
dependencies = [ dependencies = [
"async-channel", "async-channel",
"async-io 2.5.0", "async-io 2.4.1",
"async-lock 3.4.0", "async-lock 3.4.0",
"async-signal", "async-signal",
"async-task", "async-task",
@ -552,6 +553,7 @@ dependencies = [
"event-listener 5.4.0", "event-listener 5.4.0",
"futures-lite 2.6.0", "futures-lite 2.6.0",
"rustix 1.0.8", "rustix 1.0.8",
"tracing",
] ]
[[package]] [[package]]
@ -567,11 +569,11 @@ dependencies = [
[[package]] [[package]]
name = "async-signal" name = "async-signal"
version = "0.2.12" version = "0.2.11"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f567af260ef69e1d52c2b560ce0ea230763e6fbb9214a85d768760a920e3e3c1" checksum = "d7605a4e50d4b06df3898d5a70bf5fde51ed9059b0434b73105193bc27acce0d"
dependencies = [ dependencies = [
"async-io 2.5.0", "async-io 2.4.1",
"async-lock 3.4.0", "async-lock 3.4.0",
"atomic-waker", "atomic-waker",
"cfg-if", "cfg-if",
@ -580,7 +582,7 @@ dependencies = [
"rustix 1.0.8", "rustix 1.0.8",
"signal-hook-registry", "signal-hook-registry",
"slab", "slab",
"windows-sys 0.60.2", "windows-sys 0.59.0",
] ]
[[package]] [[package]]
@ -988,9 +990,9 @@ dependencies = [
[[package]] [[package]]
name = "bytemuck_derive" name = "bytemuck_derive"
version = "1.10.0" version = "1.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "441473f2b4b0459a68628c744bc61d23e730fb00128b841d30fa4bb3972257e4" checksum = "7ecc273b49b3205b83d648f0690daa588925572cc5063745bfe547fe7ec8e1a1"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -1033,7 +1035,7 @@ checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec"
dependencies = [ dependencies = [
"bitflags 2.9.1", "bitflags 2.9.1",
"log", "log",
"polling 3.9.0", "polling 3.8.0",
"rustix 0.38.44", "rustix 0.38.44",
"slab", "slab",
"thiserror 1.0.69", "thiserror 1.0.69",
@ -1053,9 +1055,9 @@ dependencies = [
[[package]] [[package]]
name = "cc" name = "cc"
version = "1.2.30" version = "1.2.29"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "deec109607ca693028562ed836a5f1c4b8bd77755c4e132fc5ce11b0b6211ae7" checksum = "5c1599538de2394445747c8cf7935946e3cc27e9625f889d979bfb2aaf569362"
dependencies = [ dependencies = [
"jobserver", "jobserver",
"libc", "libc",
@ -1193,9 +1195,9 @@ checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675"
[[package]] [[package]]
name = "clipboard-win" name = "clipboard-win"
version = "5.4.1" version = "5.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bde03770d3df201d4fb868f2c9c59e66a3e4e2bd06692a0fe701e7103c7e84d4" checksum = "15efe7a882b08f34e38556b14f2fb3daa98769d06c7f0c1b076dfd0d983bc892"
dependencies = [ dependencies = [
"error-code", "error-code",
] ]
@ -1490,7 +1492,7 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-comp-config" name = "cosmic-comp-config"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/cosmic-comp#7ccfd7381e54f07950024648786c64200c6ca925" source = "git+https://github.com/pop-os/cosmic-comp#0ef372f797b78f44cd054b049bab7d9d2a042dd0"
dependencies = [ dependencies = [
"cosmic-config", "cosmic-config",
"input", "input",
@ -1500,7 +1502,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#05874e8ea252be0e6115c268aef18a19019842f4" source = "git+https://github.com/pop-os/libcosmic#b58d864e85b3b842132e9be1b6445ad21c1f0258"
dependencies = [ dependencies = [
"atomicwrites", "atomicwrites",
"cosmic-config-derive", "cosmic-config-derive",
@ -1522,7 +1524,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#05874e8ea252be0e6115c268aef18a19019842f4" source = "git+https://github.com/pop-os/libcosmic#b58d864e85b3b842132e9be1b6445ad21c1f0258"
dependencies = [ dependencies = [
"quote", "quote",
"syn 2.0.104", "syn 2.0.104",
@ -1575,7 +1577,7 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-mime-apps" name = "cosmic-mime-apps"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/cosmic-mime-apps#24ee9e9a743c570437875b9d2066bda0ef7dba98" source = "git+https://github.com/pop-os/cosmic-mime-apps#b0b85933dd7bc6e6f51d3d2a7312dbd6dc162cf3"
dependencies = [ dependencies = [
"freedesktop-desktop-entry", "freedesktop-desktop-entry",
"mime 0.3.17", "mime 0.3.17",
@ -1586,7 +1588,7 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-panel-config" name = "cosmic-panel-config"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/cosmic-panel#da27f533d9fad2f1b5e85c523217466c952709ce" source = "git+https://github.com/pop-os/cosmic-panel#1985e806e082af798e3b542cdd8bc5b32457fe72"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"cosmic-config", "cosmic-config",
@ -1723,7 +1725,7 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-settings-config" name = "cosmic-settings-config"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/cosmic-settings-daemon#f4f4fb39fb000bf8458404fe1629fb07cfd07235" source = "git+https://github.com/pop-os/cosmic-settings-daemon#a36683fd5b7dea4011da278c91d0645117dc39f8"
dependencies = [ dependencies = [
"cosmic-config", "cosmic-config",
"ron 0.9.0", "ron 0.9.0",
@ -1745,7 +1747,7 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-settings-daemon-config" name = "cosmic-settings-daemon-config"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/cosmic-settings-daemon#f4f4fb39fb000bf8458404fe1629fb07cfd07235" source = "git+https://github.com/pop-os/cosmic-settings-daemon#a36683fd5b7dea4011da278c91d0645117dc39f8"
dependencies = [ dependencies = [
"cosmic-config", "cosmic-config",
"ron 0.8.1", "ron 0.8.1",
@ -1769,15 +1771,18 @@ 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#d9e9639062df73623d04396d7b4473511d5812a4" source = "git+https://github.com/pop-os/cosmic-settings-subscriptions#ebb1f7f186ca1bbfcb5a969bbeba122c70b1e961"
dependencies = [ dependencies = [
"async-fn-stream",
"bluez-zbus", "bluez-zbus",
"cosmic-dbus-a11y", "cosmic-dbus-a11y",
"cosmic-dbus-networkmanager", "cosmic-dbus-networkmanager",
"cosmic-protocols", "cosmic-protocols",
"futures", "futures",
"iced_futures", "iced_futures",
"indexmap 2.10.0",
"itertools 0.14.0", "itertools 0.14.0",
"libcosmic",
"libpulse-binding", "libpulse-binding",
"log", "log",
"num-derive", "num-derive",
@ -1851,7 +1856,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#05874e8ea252be0e6115c268aef18a19019842f4" source = "git+https://github.com/pop-os/libcosmic#b58d864e85b3b842132e9be1b6445ad21c1f0258"
dependencies = [ dependencies = [
"almost", "almost",
"cosmic-config", "cosmic-config",
@ -2174,7 +2179,7 @@ checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab"
dependencies = [ dependencies = [
"libc", "libc",
"option-ext", "option-ext",
"redox_users 0.5.1", "redox_users 0.5.0",
"windows-sys 0.60.2", "windows-sys 0.60.2",
] ]
@ -2295,9 +2300,9 @@ dependencies = [
[[package]] [[package]]
name = "dyn-clone" name = "dyn-clone"
version = "1.0.20" version = "1.0.19"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555" checksum = "1c7a8fb8a9fbf66c1f703fe16184d10ca0ee9d23be5b4436400408ba54a95005"
[[package]] [[package]]
name = "either" name = "either"
@ -3250,7 +3255,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#05874e8ea252be0e6115c268aef18a19019842f4" source = "git+https://github.com/pop-os/libcosmic#b58d864e85b3b842132e9be1b6445ad21c1f0258"
dependencies = [ dependencies = [
"dnd", "dnd",
"iced_accessibility", "iced_accessibility",
@ -3268,7 +3273,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#05874e8ea252be0e6115c268aef18a19019842f4" source = "git+https://github.com/pop-os/libcosmic#b58d864e85b3b842132e9be1b6445ad21c1f0258"
dependencies = [ dependencies = [
"accesskit", "accesskit",
"accesskit_winit", "accesskit_winit",
@ -3277,7 +3282,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#05874e8ea252be0e6115c268aef18a19019842f4" source = "git+https://github.com/pop-os/libcosmic#b58d864e85b3b842132e9be1b6445ad21c1f0258"
dependencies = [ dependencies = [
"bitflags 2.9.1", "bitflags 2.9.1",
"bytes", "bytes",
@ -3302,7 +3307,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#05874e8ea252be0e6115c268aef18a19019842f4" source = "git+https://github.com/pop-os/libcosmic#b58d864e85b3b842132e9be1b6445ad21c1f0258"
dependencies = [ dependencies = [
"futures", "futures",
"iced_core", "iced_core",
@ -3328,7 +3333,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#05874e8ea252be0e6115c268aef18a19019842f4" source = "git+https://github.com/pop-os/libcosmic#b58d864e85b3b842132e9be1b6445ad21c1f0258"
dependencies = [ dependencies = [
"bitflags 2.9.1", "bitflags 2.9.1",
"bytemuck", "bytemuck",
@ -3350,7 +3355,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#05874e8ea252be0e6115c268aef18a19019842f4" source = "git+https://github.com/pop-os/libcosmic#b58d864e85b3b842132e9be1b6445ad21c1f0258"
dependencies = [ dependencies = [
"iced_graphics", "iced_graphics",
"iced_tiny_skia", "iced_tiny_skia",
@ -3362,7 +3367,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#05874e8ea252be0e6115c268aef18a19019842f4" source = "git+https://github.com/pop-os/libcosmic#b58d864e85b3b842132e9be1b6445ad21c1f0258"
dependencies = [ dependencies = [
"bytes", "bytes",
"cosmic-client-toolkit", "cosmic-client-toolkit",
@ -3378,7 +3383,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#05874e8ea252be0e6115c268aef18a19019842f4" source = "git+https://github.com/pop-os/libcosmic#b58d864e85b3b842132e9be1b6445ad21c1f0258"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"cosmic-text", "cosmic-text",
@ -3394,7 +3399,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#05874e8ea252be0e6115c268aef18a19019842f4" source = "git+https://github.com/pop-os/libcosmic#b58d864e85b3b842132e9be1b6445ad21c1f0258"
dependencies = [ dependencies = [
"as-raw-xcb-connection", "as-raw-xcb-connection",
"bitflags 2.9.1", "bitflags 2.9.1",
@ -3425,7 +3430,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#05874e8ea252be0e6115c268aef18a19019842f4" source = "git+https://github.com/pop-os/libcosmic#b58d864e85b3b842132e9be1b6445ad21c1f0258"
dependencies = [ dependencies = [
"cosmic-client-toolkit", "cosmic-client-toolkit",
"dnd", "dnd",
@ -3445,7 +3450,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#05874e8ea252be0e6115c268aef18a19019842f4" source = "git+https://github.com/pop-os/libcosmic#b58d864e85b3b842132e9be1b6445ad21c1f0258"
dependencies = [ dependencies = [
"cosmic-client-toolkit", "cosmic-client-toolkit",
"dnd", "dnd",
@ -4181,9 +4186,9 @@ dependencies = [
[[package]] [[package]]
name = "io-uring" name = "io-uring"
version = "0.7.9" version = "0.7.8"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d93587f37623a1a17d94ef2bc9ada592f5465fe7732084ab7beefabe5c77c0c4" checksum = "b86e202f00093dcba4275d4636b93ef9dd75d025ae560d2521b45ea28ab49013"
dependencies = [ dependencies = [
"bitflags 2.9.1", "bitflags 2.9.1",
"cfg-if", "cfg-if",
@ -4304,9 +4309,9 @@ dependencies = [
[[package]] [[package]]
name = "jxl-frame" name = "jxl-frame"
version = "0.13.1" version = "0.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f30587a9687223a602a408555db47803c907ea47700e1f28eb14cdb3bf1527a9" checksum = "e5b0b31f0de176f38c1b8da911f9cab337bf29e2f59bc38398fd96ef05357b95"
dependencies = [ dependencies = [
"jxl-bitstream", "jxl-bitstream",
"jxl-coding", "jxl-coding",
@ -4321,9 +4326,9 @@ dependencies = [
[[package]] [[package]]
name = "jxl-grid" name = "jxl-grid"
version = "0.6.0" version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "335e4371396c5729ba80a42798746d198897d3b854ba4f3684efac5f4025d84f" checksum = "a0e0ef92d5d60e76bf41098e57e985f523185e08fad54268da448637feca6989"
dependencies = [ dependencies = [
"tracing", "tracing",
] ]
@ -4360,9 +4365,9 @@ dependencies = [
[[package]] [[package]]
name = "jxl-modular" name = "jxl-modular"
version = "0.11.0" version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f526ad8af8daea0d1cccce945f18c241f95b391d34443be018de2efbf28b44e" checksum = "aa97a2e3752859d45506fa062e38a0768867beca5993b2ca20227d3aab5a1cc9"
dependencies = [ dependencies = [
"jxl-bitstream", "jxl-bitstream",
"jxl-coding", "jxl-coding",
@ -4374,9 +4379,9 @@ dependencies = [
[[package]] [[package]]
name = "jxl-oxide" name = "jxl-oxide"
version = "0.12.2" version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6e45ccb25d698cdcad3a5573a7181835842711fd951c98fe38986e3cb721e775" checksum = "6644c2764ff41cd9b366804229e21a3cd7db45da4a436f9a21e15c0c26433651"
dependencies = [ dependencies = [
"brotli-decompressor", "brotli-decompressor",
"jxl-bitstream", "jxl-bitstream",
@ -4402,9 +4407,9 @@ dependencies = [
[[package]] [[package]]
name = "jxl-render" name = "jxl-render"
version = "0.12.1" version = "0.12.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b3f3fece78b2104450bd6d1bdbc48e3b6ef7442ef276be2a08e35b229eeff1a4" checksum = "ab17c55b16932f1e931c51f82f6b22dfaa0a70cfb257b66863a3f7d421a3681e"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"jxl-bitstream", "jxl-bitstream",
@ -4486,11 +4491,11 @@ checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc"
[[package]] [[package]]
name = "known-folders" name = "known-folders"
version = "1.3.1" version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c644f4623d1c55eb60a9dac35e0858a59f982fb87db6ce34c872372b0a5b728f" checksum = "b7d9a1740cc8b46e259a0eb787d79d855e79ff10b9855a5eba58868d5da7927c"
dependencies = [ dependencies = [
"windows-sys 0.60.2", "windows-sys 0.59.0",
] ]
[[package]] [[package]]
@ -4525,12 +4530,11 @@ dependencies = [
[[package]] [[package]]
name = "kurbo" name = "kurbo"
version = "0.11.3" version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c62026ae44756f8a599ba21140f350303d4f08dcdcc71b5ad9c9bb8128c13c62" checksum = "1077d333efea6170d9ccb96d3c3026f300ca0773da4938cc4c811daa6df68b0c"
dependencies = [ dependencies = [
"arrayvec", "arrayvec",
"euclid",
"smallvec", "smallvec",
] ]
@ -4561,7 +4565,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#05874e8ea252be0e6115c268aef18a19019842f4" source = "git+https://github.com/pop-os/libcosmic#b58d864e85b3b842132e9be1b6445ad21c1f0258"
dependencies = [ dependencies = [
"apply", "apply",
"ashpd", "ashpd",
@ -4619,7 +4623,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667" checksum = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"windows-targets 0.53.3", "windows-targets 0.53.2",
] ]
[[package]] [[package]]
@ -4657,13 +4661,13 @@ dependencies = [
[[package]] [[package]]
name = "libredox" name = "libredox"
version = "0.1.9" version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "391290121bad3d37fbddad76d8f5d1c1c314cfc646d143d7e07a3086ddff0ce3" checksum = "1580801010e535496706ba011c15f8532df6b42297d2e471fec38ceadd8c0638"
dependencies = [ dependencies = [
"bitflags 2.9.1", "bitflags 2.9.1",
"libc", "libc",
"redox_syscall 0.5.17", "redox_syscall 0.5.13",
] ]
[[package]] [[package]]
@ -4742,9 +4746,9 @@ checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956"
[[package]] [[package]]
name = "litrs" name = "litrs"
version = "0.4.2" version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f5e54036fe321fd421e10d732f155734c4e4afd610dd556d9a82833ab3ee0bed" checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5"
[[package]] [[package]]
name = "locale1" name = "locale1"
@ -5724,9 +5728,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
[[package]] [[package]]
name = "owned_ttf_parser" name = "owned_ttf_parser"
version = "0.25.1" version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "36820e9051aca1014ddc75770aab4d68bc1e9e632f0f5627c4086bc216fb583b" checksum = "22ec719bbf3b2a81c109a4e20b1f129b5566b7dce654bc3872f6a05abf82b2c4"
dependencies = [ dependencies = [
"ttf-parser 0.25.1", "ttf-parser 0.25.1",
] ]
@ -5811,7 +5815,7 @@ checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"libc", "libc",
"redox_syscall 0.5.17", "redox_syscall 0.5.13",
"smallvec", "smallvec",
"windows-targets 0.52.6", "windows-targets 0.52.6",
] ]
@ -5984,16 +5988,17 @@ dependencies = [
[[package]] [[package]]
name = "polling" name = "polling"
version = "3.9.0" version = "3.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ee9b2fa7a4517d2c91ff5bc6c297a427a96749d15f98fcdbb22c05571a4d4b7" checksum = "b53a684391ad002dd6a596ceb6c74fd004fdce75f4be2e3f615068abbea5fd50"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"concurrent-queue", "concurrent-queue",
"hermit-abi 0.5.2", "hermit-abi 0.5.2",
"pin-project-lite", "pin-project-lite",
"rustix 1.0.8", "rustix 1.0.8",
"windows-sys 0.60.2", "tracing",
"windows-sys 0.59.0",
] ]
[[package]] [[package]]
@ -6229,9 +6234,9 @@ dependencies = [
[[package]] [[package]]
name = "rand" name = "rand"
version = "0.9.2" version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97"
dependencies = [ dependencies = [
"rand_chacha 0.9.0", "rand_chacha 0.9.0",
"rand_core 0.9.3", "rand_core 0.9.3",
@ -6283,9 +6288,9 @@ checksum = "c3d6831663a5098ea164f89cff59c6284e95f4e3c76ce9848d4529f5ccca9bde"
[[package]] [[package]]
name = "rangemap" name = "rangemap"
version = "1.6.0" version = "1.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f93e7e49bb0bf967717f7bd674458b3d6b0c5f48ec7e3038166026a69fc22223" checksum = "f60fcc7d6849342eff22c4350c8b9a989ee8ceabc4b481253e8946b9fe83d684"
[[package]] [[package]]
name = "rav1e" name = "rav1e"
@ -6393,9 +6398,9 @@ dependencies = [
[[package]] [[package]]
name = "redox_syscall" name = "redox_syscall"
version = "0.5.17" version = "0.5.13"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5407465600fb0548f1442edf71dd20683c6ed326200ace4b1ef0763521bb3b77" checksum = "0d04b7d0ee6b4a0207a0a7adb104d23ecb0b47d6beae7152d0fa34b692b29fd6"
dependencies = [ dependencies = [
"bitflags 2.9.1", "bitflags 2.9.1",
] ]
@ -6413,9 +6418,9 @@ dependencies = [
[[package]] [[package]]
name = "redox_users" name = "redox_users"
version = "0.5.1" version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "78eaea1f52c56d57821be178b2d47e09ff26481a6042e8e042fcb0ced068b470" checksum = "dd6f9d3d47bdd2ad6945c5015a226ec6155d0bcdfd8f7cd29f86b71f8de99d2b"
dependencies = [ dependencies = [
"getrandom 0.2.16", "getrandom 0.2.16",
"libredox", "libredox",
@ -6684,9 +6689,9 @@ dependencies = [
[[package]] [[package]]
name = "rustc-demangle" name = "rustc-demangle"
version = "0.1.26" version = "0.1.25"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "56f7d92ca342cea22a06f2121d944b4fd82af56988c270852495420f961d4ace" checksum = "989e6739f80c4ad5b13e0fd7fe89531180375b18520cc8c82080e4dc4035b84f"
[[package]] [[package]]
name = "rustc-hash" name = "rustc-hash"
@ -6883,9 +6888,9 @@ dependencies = [
[[package]] [[package]]
name = "serde_json" name = "serde_json"
version = "1.0.141" version = "1.0.140"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "30b9eff21ebe718216c6ec64e1d9ac57087aad11efc64e32002bce4a0d4c03d3" checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
dependencies = [ dependencies = [
"indexmap 2.10.0", "indexmap 2.10.0",
"itoa", "itoa",
@ -7274,7 +7279,7 @@ version = "0.15.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "68c7541fff44b35860c1a7a47a7cadf3e4a304c457b58f9870d9706ece028afc" checksum = "68c7541fff44b35860c1a7a47a7cadf3e4a304c457b58f9870d9706ece028afc"
dependencies = [ dependencies = [
"kurbo 0.11.3", "kurbo 0.11.2",
"siphasher", "siphasher",
] ]
@ -7597,9 +7602,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]] [[package]]
name = "tokio" name = "tokio"
version = "1.47.0" version = "1.47.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "43864ed400b6043a4757a25c7a64a8efde741aed79a056a2fb348a406701bb35" checksum = "89e49afdadebb872d3145a5638b59eb0691ea23e46ca484037cfab3b76b95038"
dependencies = [ dependencies = [
"backtrace", "backtrace",
"bytes", "bytes",
@ -7945,7 +7950,7 @@ dependencies = [
"flate2", "flate2",
"fontdb 0.18.0", "fontdb 0.18.0",
"imagesize", "imagesize",
"kurbo 0.11.3", "kurbo 0.11.2",
"log", "log",
"pico-args", "pico-args",
"roxmltree", "roxmltree",
@ -8143,13 +8148,13 @@ dependencies = [
[[package]] [[package]]
name = "wayland-backend" name = "wayland-backend"
version = "0.3.11" version = "0.3.10"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "673a33c33048a5ade91a6b139580fa174e19fb0d23f396dca9fa15f2e1e49b35" checksum = "fe770181423e5fc79d3e2a7f4410b7799d5aab1de4372853de3c6aa13ca24121"
dependencies = [ dependencies = [
"cc", "cc",
"downcast-rs 1.2.1", "downcast-rs 1.2.1",
"rustix 1.0.8", "rustix 0.38.44",
"scoped-tls", "scoped-tls",
"smallvec", "smallvec",
"wayland-sys", "wayland-sys",
@ -8157,12 +8162,12 @@ dependencies = [
[[package]] [[package]]
name = "wayland-client" name = "wayland-client"
version = "0.31.11" version = "0.31.10"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c66a47e840dc20793f2264eb4b3e4ecb4b75d91c0dd4af04b456128e0bdd449d" checksum = "978fa7c67b0847dbd6a9f350ca2569174974cd4082737054dbb7fbb79d7d9a61"
dependencies = [ dependencies = [
"bitflags 2.9.1", "bitflags 2.9.1",
"rustix 1.0.8", "rustix 0.38.44",
"wayland-backend", "wayland-backend",
"wayland-scanner", "wayland-scanner",
] ]
@ -8180,20 +8185,20 @@ dependencies = [
[[package]] [[package]]
name = "wayland-cursor" name = "wayland-cursor"
version = "0.31.11" version = "0.31.10"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "447ccc440a881271b19e9989f75726d60faa09b95b0200a9b7eb5cc47c3eeb29" checksum = "a65317158dec28d00416cb16705934070aef4f8393353d41126c54264ae0f182"
dependencies = [ dependencies = [
"rustix 1.0.8", "rustix 0.38.44",
"wayland-client", "wayland-client",
"xcursor", "xcursor",
] ]
[[package]] [[package]]
name = "wayland-protocols" name = "wayland-protocols"
version = "0.32.9" version = "0.32.8"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "efa790ed75fbfd71283bd2521a1cfdc022aabcc28bdcff00851f9e4ae88d9901" checksum = "779075454e1e9a521794fed15886323ea0feda3f8b0fc1390f5398141310422a"
dependencies = [ dependencies = [
"bitflags 2.9.1", "bitflags 2.9.1",
"wayland-backend", "wayland-backend",
@ -8204,9 +8209,9 @@ dependencies = [
[[package]] [[package]]
name = "wayland-protocols-plasma" name = "wayland-protocols-plasma"
version = "0.3.9" version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a07a14257c077ab3279987c4f8bb987851bf57081b93710381daea94f2c2c032" checksum = "4fd38cdad69b56ace413c6bcc1fbf5acc5e2ef4af9d5f8f1f9570c0c83eae175"
dependencies = [ dependencies = [
"bitflags 2.9.1", "bitflags 2.9.1",
"wayland-backend", "wayland-backend",
@ -8217,9 +8222,9 @@ dependencies = [
[[package]] [[package]]
name = "wayland-protocols-wlr" name = "wayland-protocols-wlr"
version = "0.3.9" version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "efd94963ed43cf9938a090ca4f7da58eb55325ec8200c3848963e98dc25b78ec" checksum = "1cb6cdc73399c0e06504c437fe3cf886f25568dd5454473d565085b36d6a8bbf"
dependencies = [ dependencies = [
"bitflags 2.9.1", "bitflags 2.9.1",
"wayland-backend", "wayland-backend",
@ -8231,9 +8236,9 @@ dependencies = [
[[package]] [[package]]
name = "wayland-scanner" name = "wayland-scanner"
version = "0.31.7" version = "0.31.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "54cb1e9dc49da91950bdfd8b848c49330536d9d1fb03d4bfec8cae50caa50ae3" checksum = "896fdafd5d28145fce7958917d69f2fd44469b1d4e861cb5961bcbeebc6d1484"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quick-xml", "quick-xml",
@ -8242,22 +8247,22 @@ dependencies = [
[[package]] [[package]]
name = "wayland-server" name = "wayland-server"
version = "0.31.10" version = "0.31.9"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fcbd4f3aba6c9fba70445ad2a484c0ef0356c1a9459b1e8e435bedc1971a6222" checksum = "485dfb8ccf0daa0d34625d34e6ac15f99e550a7999b6fd88a0835ccd37655785"
dependencies = [ dependencies = [
"bitflags 2.9.1", "bitflags 2.9.1",
"downcast-rs 1.2.1", "downcast-rs 1.2.1",
"rustix 1.0.8", "rustix 0.38.44",
"wayland-backend", "wayland-backend",
"wayland-scanner", "wayland-scanner",
] ]
[[package]] [[package]]
name = "wayland-sys" name = "wayland-sys"
version = "0.31.7" version = "0.31.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "34949b42822155826b41db8e5d0c1be3a2bd296c747577a43a3e6daefc296142" checksum = "dbcebb399c77d5aa9fa5db874806ee7b4eba4e73650948e8f93963f128896615"
dependencies = [ dependencies = [
"dlib", "dlib",
"log", "log",
@ -8674,7 +8679,7 @@ version = "0.60.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
dependencies = [ dependencies = [
"windows-targets 0.53.3", "windows-targets 0.53.2",
] ]
[[package]] [[package]]
@ -8725,11 +8730,10 @@ dependencies = [
[[package]] [[package]]
name = "windows-targets" name = "windows-targets"
version = "0.53.3" version = "0.53.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91" checksum = "c66f69fcc9ce11da9966ddb31a40968cad001c5bedeb5c2b82ede4253ab48aef"
dependencies = [ dependencies = [
"windows-link",
"windows_aarch64_gnullvm 0.53.0", "windows_aarch64_gnullvm 0.53.0",
"windows_aarch64_msvc 0.53.0", "windows_aarch64_msvc 0.53.0",
"windows_i686_gnu 0.53.0", "windows_i686_gnu 0.53.0",
@ -9103,7 +9107,7 @@ dependencies = [
[[package]] [[package]]
name = "xdg-shell-wrapper-config" name = "xdg-shell-wrapper-config"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/cosmic-panel#da27f533d9fad2f1b5e85c523217466c952709ce" source = "git+https://github.com/pop-os/cosmic-panel#1985e806e082af798e3b542cdd8bc5b32457fe72"
dependencies = [ dependencies = [
"serde", "serde",
"wayland-protocols-wlr", "wayland-protocols-wlr",
@ -9277,9 +9281,9 @@ checksum = "4bb4f9a464286d42851d18a605f7193b8febaf5b0919d71c6399b7b26e5b0aad"
dependencies = [ dependencies = [
"async-broadcast 0.7.2", "async-broadcast 0.7.2",
"async-executor", "async-executor",
"async-io 2.5.0", "async-io 2.4.1",
"async-lock 3.4.0", "async-lock 3.4.0",
"async-process 2.4.0", "async-process 2.3.1",
"async-recursion", "async-recursion",
"async-task", "async-task",
"async-trait", "async-trait",
@ -9504,9 +9508,9 @@ dependencies = [
[[package]] [[package]]
name = "zune-jpeg" name = "zune-jpeg"
version = "0.4.20" version = "0.4.19"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fc1f7e205ce79eb2da3cd71c5f55f3589785cb7c79f6a03d1c8d1491bda5d089" checksum = "2c9e525af0a6a658e031e95f14b7f889976b74a11ba0eca5a5fc9ac8a1c43a6a"
dependencies = [ dependencies = [
"zune-core", "zune-core",
] ]

3
Cargo.toml
View file

@ -33,8 +33,7 @@ git = "https://github.com/pop-os/cosmic-panel"
git = "https://github.com/pop-os/cosmic-randr" git = "https://github.com/pop-os/cosmic-randr"
[workspace.dependencies.cosmic-settings-subscriptions] [workspace.dependencies.cosmic-settings-subscriptions]
# git = "https://github.com/pop-os/cosmic-settings-subscriptions" git = "https://github.com/pop-os/cosmic-settings-subscriptions"
path = "../../pop/cosmic-settings-subscriptions"
[workspace.dependencies.sctk] [workspace.dependencies.sctk]
git = "https://github.com/smithay/client-toolkit/" git = "https://github.com/smithay/client-toolkit/"

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

@ -15,6 +15,7 @@ use cosmic_settings_subscriptions::sound as subscription;
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
pub enum Message { pub enum Message {
/// Change the balance of the active sink.
SinkBalanceChanged(u32), SinkBalanceChanged(u32),
/// Change the default output. /// Change the default output.
SinkChanged(usize), SinkChanged(usize),
@ -32,8 +33,8 @@ pub enum Message {
SourceProfileChanged(usize), SourceProfileChanged(usize),
/// Request to change the input volume. /// Request to change the input volume.
SourceVolumeChanged(u32), SourceVolumeChanged(u32),
/// /// Messages handled by the sound module in cosmic-settings-subscriptions
Subscription(subscription::sound::Message), Subscription(subscription::Message),
/// Surface Action /// Surface Action
Surface(surface::Action), Surface(surface::Action),
} }
@ -50,7 +51,7 @@ impl From<Message> for crate::Message {
} }
} }
impl Into<Message> for subscription::sound::Message { impl Into<Message> for subscription::Message {
fn into(self) -> Message { fn into(self) -> Message {
Message::Subscription(self) Message::Subscription(self)
} }
@ -59,7 +60,7 @@ impl Into<Message> for subscription::sound::Message {
#[derive(Default)] #[derive(Default)]
pub struct Page { pub struct Page {
entity: page::Entity, entity: page::Entity,
model: subscription::sound::Model, model: subscription::Model,
} }
impl page::Page<crate::pages::Message> for Page { impl page::Page<crate::pages::Message> for Page {