chore: align subscriptions with local stack
This commit is contained in:
parent
553c05e2f0
commit
32d71847b6
10 changed files with 12 additions and 12 deletions
|
|
@ -7,8 +7,8 @@ rust-version.workspace = true
|
||||||
publish = true
|
publish = true
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols" }
|
cosmic-protocols = { path = "../../../cosmic-protocols" }
|
||||||
iced_futures = { git = "https://github.com/pop-os/libcosmic" }
|
iced_futures = { path = "../../../libcosmic/iced/futures" }
|
||||||
num-derive = "0.4.2"
|
num-derive = "0.4.2"
|
||||||
num-traits = "0.2.19"
|
num-traits = "0.2.19"
|
||||||
sctk.workspace = true
|
sctk.workspace = true
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@ publish = true
|
||||||
[dependencies]
|
[dependencies]
|
||||||
cosmic-dbus-a11y = { git = "https://github.com/pop-os/dbus-settings-bindings" }
|
cosmic-dbus-a11y = { git = "https://github.com/pop-os/dbus-settings-bindings" }
|
||||||
futures = "0.3.32"
|
futures = "0.3.32"
|
||||||
iced_futures = { git = "https://github.com/pop-os/libcosmic" }
|
iced_futures = { path = "../../../libcosmic/iced/futures" }
|
||||||
tokio = { version = "1.49.0", features = ["sync", "time"] }
|
tokio = { version = "1.49.0", features = ["sync", "time"] }
|
||||||
tracing = "0.1.44"
|
tracing = "0.1.44"
|
||||||
zbus = "5.13"
|
zbus = "5.13"
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@ publish = true
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
futures = "0.3.32"
|
futures = "0.3.32"
|
||||||
iced_futures = { git = "https://github.com/pop-os/libcosmic" }
|
iced_futures = { path = "../../../libcosmic/iced/futures" }
|
||||||
log = "0.4.29"
|
log = "0.4.29"
|
||||||
rustix = "1.1.3"
|
rustix = "1.1.3"
|
||||||
tokio = "1.49.0"
|
tokio = "1.49.0"
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@ cosmic-dbus-networkmanager = { git = "https://github.com/pop-os/dbus-settings-bi
|
||||||
secret-service = { version = "5.1.0", features = ["rt-tokio-crypto-rust"] }
|
secret-service = { version = "5.1.0", features = ["rt-tokio-crypto-rust"] }
|
||||||
nm-secret-agent-manager = { git = "https://github.com/pop-os/dbus-settings-bindings" }
|
nm-secret-agent-manager = { git = "https://github.com/pop-os/dbus-settings-bindings" }
|
||||||
futures = "0.3.32"
|
futures = "0.3.32"
|
||||||
iced_futures = { git = "https://github.com/pop-os/libcosmic" }
|
iced_futures = { path = "../../../libcosmic/iced/futures" }
|
||||||
itertools = "0.14.0"
|
itertools = "0.14.0"
|
||||||
secure-string = "0.3.0"
|
secure-string = "0.3.0"
|
||||||
thiserror = "2.0.18"
|
thiserror = "2.0.18"
|
||||||
|
|
|
||||||
|
|
@ -188,7 +188,7 @@ pub fn subscription<I: 'static + Hash + Copy + Send + Sync + Debug>(
|
||||||
conn,
|
conn,
|
||||||
},
|
},
|
||||||
|Wrapper {
|
|Wrapper {
|
||||||
id,
|
id: _,
|
||||||
has_popup,
|
has_popup,
|
||||||
conn,
|
conn,
|
||||||
}| {
|
}| {
|
||||||
|
|
|
||||||
|
|
@ -140,7 +140,7 @@ pub fn subscription<I: Copy + Debug + std::hash::Hash + 'static>(
|
||||||
self.id.hash(state);
|
self.id.hash(state);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Subscription::run_with(Wrapper { id, conn }, |Wrapper { id, conn }| {
|
Subscription::run_with(Wrapper { id, conn }, |Wrapper { id: _, conn }| {
|
||||||
let conn = conn.clone();
|
let conn = conn.clone();
|
||||||
stream::channel(
|
stream::channel(
|
||||||
50,
|
50,
|
||||||
|
|
|
||||||
|
|
@ -7,6 +7,6 @@ rust-version.workspace = true
|
||||||
[dependencies]
|
[dependencies]
|
||||||
libpulse-binding = { version = "2.30.1" }
|
libpulse-binding = { version = "2.30.1" }
|
||||||
rustix = { version = "1.1.3", features = ["pipe"] }
|
rustix = { version = "1.1.3", features = ["pipe"] }
|
||||||
iced_futures = { git = "https://github.com/pop-os/libcosmic" }
|
iced_futures = { path = "../../../libcosmic/iced/futures" }
|
||||||
futures = "0.3.32"
|
futures = "0.3.32"
|
||||||
log = "0.4.27"
|
log = "0.4.27"
|
||||||
|
|
|
||||||
|
|
@ -281,7 +281,7 @@ impl PulseChannels {
|
||||||
/// Set the speaker balance of the active sink.
|
/// Set the speaker balance of the active sink.
|
||||||
pub fn set_balance(&mut self, balance: f32) {
|
pub fn set_balance(&mut self, balance: f32) {
|
||||||
if let Err(err) = self.tx.send(Request::Balance(self.index, balance)) {
|
if let Err(err) = self.tx.send(Request::Balance(self.index, balance)) {
|
||||||
log::error!("Failed to send new balance to channel");
|
log::error!("Failed to send new balance to channel: {err}");
|
||||||
} else {
|
} else {
|
||||||
self.pipe_tx
|
self.pipe_tx
|
||||||
.write_all(&[1])
|
.write_all(&[1])
|
||||||
|
|
@ -292,7 +292,7 @@ impl PulseChannels {
|
||||||
/// Set the volume of the active sink.
|
/// Set the volume of the active sink.
|
||||||
pub fn set_volume(&mut self, volume: f32) {
|
pub fn set_volume(&mut self, volume: f32) {
|
||||||
if let Err(err) = self.tx.send(Request::Volume(self.index, volume)) {
|
if let Err(err) = self.tx.send(Request::Volume(self.index, volume)) {
|
||||||
log::error!("Failed to send new volume to channel");
|
log::error!("Failed to send new volume to channel: {err}");
|
||||||
} else {
|
} else {
|
||||||
self.pipe_tx
|
self.pipe_tx
|
||||||
.write_all(&[1])
|
.write_all(&[1])
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@ publish = true
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
futures = "0.3.32"
|
futures = "0.3.32"
|
||||||
iced_futures = { git = "https://github.com/pop-os/libcosmic" }
|
iced_futures = { path = "../../../libcosmic/iced/futures" }
|
||||||
log = "0.4.29"
|
log = "0.4.29"
|
||||||
tokio = "1.49.0"
|
tokio = "1.49.0"
|
||||||
tokio-stream = "0.1.18"
|
tokio-stream = "0.1.18"
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@ publish = true
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
futures = "0.3.32"
|
futures = "0.3.32"
|
||||||
iced_futures = { git = "https://github.com/pop-os/libcosmic" }
|
iced_futures = { path = "../../../libcosmic/iced/futures" }
|
||||||
log = "0.4.29"
|
log = "0.4.29"
|
||||||
tokio = "1.49.0"
|
tokio = "1.49.0"
|
||||||
tokio-stream = "0.1.18"
|
tokio-stream = "0.1.18"
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue