Skip to content

Commit a3fb55a

Browse files
mmstickwash2
authored andcommitted
feat(audio): share cosmic-settings' new sound library
1 parent abf5eed commit a3fb55a

File tree

10 files changed

+572
-1476
lines changed

10 files changed

+572
-1476
lines changed

Cargo.lock

Lines changed: 408 additions & 222 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ cosmic-applets-config = { path = "cosmic-applets-config" }
3030
cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols", default-features = false, features = [
3131
"client",
3232
], rev = "d0e95be" }
33-
cosmic-settings-subscriptions = { git = "https://github.com/pop-os/cosmic-settings-subscriptions" }
34-
3533
cosmic-time = { git = "https://github.com/pop-os/cosmic-time", default-features = false }
3634
# cosmic-time = { path = "../cosmic-time", default-features = false ] }
3735

cosmic-applet-a11y/Cargo.toml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,6 @@ version = "0.1.0"
44
edition = "2024"
55

66
[dependencies]
7-
# cosmic-dbus-a11y = { git = "https://github.com/pop-os/dbus-settings-bindings" }
8-
cosmic-settings-subscriptions = { workspace = true, features = [
9-
"accessibility",
10-
"cosmic_a11y_manager",
11-
] }
127
anyhow.workspace = true
138
cctk.workspace = true
149
cosmic-protocols.workspace = true
@@ -21,3 +16,9 @@ tokio.workspace = true
2116
tracing-log.workspace = true
2217
tracing-subscriber.workspace = true
2318
tracing.workspace = true
19+
20+
[dependencies.cosmic-settings-a11y-manager-subscription]
21+
git = "https://github.com/pop-os/cosmic-settings"
22+
23+
[dependencies.cosmic-settings-accessibility-subscription]
24+
git = "https://github.com/pop-os/cosmic-settings"

cosmic-applet-a11y/src/app.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,11 @@ use cosmic::{
2424
theme::{self, CosmicTheme},
2525
widget::{Column, divider, text},
2626
};
27-
use cosmic_settings_subscriptions::{
28-
accessibility::{self, DBusRequest, DBusUpdate},
29-
cosmic_a11y_manager::{AccessibilityEvent, AccessibilityRequest, ColorFilter},
27+
28+
use cosmic_settings_a11y_manager_subscription::{
29+
self as cosmic_a11y_manager, AccessibilityEvent, AccessibilityRequest, ColorFilter,
3030
};
31+
use cosmic_settings_accessibility_subscription::{self as accessibility, DBusRequest, DBusUpdate};
3132
use cosmic_time::{Instant, Timeline, anim, chain, id};
3233
use std::sync::LazyLock;
3334
use tokio::sync::mpsc::UnboundedSender;

cosmic-applet-a11y/src/backend/wayland/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use cosmic::iced::{
99
stream,
1010
};
1111
use cosmic_protocols::a11y::v1::client::cosmic_a11y_manager_v1::Filter;
12-
use cosmic_settings_subscriptions::cosmic_a11y_manager::{
12+
use cosmic_settings_a11y_manager_subscription::{
1313
self as thread, AccessibilityEvent, AccessibilityRequest,
1414
};
1515
use std::sync::LazyLock;

cosmic-applet-audio/Cargo.toml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ edition = "2024"
55
license = "GPL-3.0-only"
66

77
[dependencies]
8-
cosmic-settings-subscriptions.workspace = true
98
cosmic-time.workspace = true
109
i18n-embed-fl.workspace = true
1110
i18n-embed.workspace = true
@@ -22,3 +21,6 @@ tracing.workspace = true
2221
url = "2"
2322
urlencoding = "2.1.3"
2423
zbus.workspace = true
24+
25+
[dependencies.cosmic-settings-sound-subscription]
26+
git = "https://github.com/pop-os/cosmic-settings"

0 commit comments

Comments
 (0)