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

audio: Fix setting default source/sink

Browse source
This commit is contained in:
Ian Douglas Scott 2022-06-23 13:04:54 -07:00
parent a431457468
commit 2e04938bbd
3 changed files with 14 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

14
applets/cosmic-applet-audio/src/input.rs
View file

@ -1,4 +1,4 @@
use gtk4::{prelude::*, Button, Label, ListBox}; use gtk4::{glib::clone, prelude::*, Button, Label, ListBox};
use libcosmic_widgets::{relm4::RelmContainerExt, LabeledItem}; use libcosmic_widgets::{relm4::RelmContainerExt, LabeledItem};
use std::rc::Rc; use std::rc::Rc;
@ -40,15 +40,9 @@ pub async fn refresh_input_widgets(pa: &PA, inputs: &ListBox) {
.unwrap_or(&name), .unwrap_or(&name),
set_child: set_current_input_device = &Button { set_child: set_current_input_device = &Button {
set_label: "Switch", set_label: "Switch",
connect_clicked: move |_| { connect_clicked: clone!(@strong pa => move |_| {
// XXX Need mutable borrow? Is this a problem for async? pa.set_default_source(&name);
/* })
SourceController::create()
.expect("failed to create input controller")
.set_default_device(&name)
.expect("failed to set default device");
*/
}
} }
} }
} }

14
applets/cosmic-applet-audio/src/output.rs
View file

@ -1,4 +1,4 @@
use gtk4::{prelude::*, Button, Label, ListBox}; use gtk4::{glib::clone, prelude::*, Button, Label, ListBox};
use libcosmic_widgets::{relm4::RelmContainerExt, LabeledItem}; use libcosmic_widgets::{relm4::RelmContainerExt, LabeledItem};
use std::rc::Rc; use std::rc::Rc;
@ -40,15 +40,9 @@ pub async fn refresh_output_widgets(pa: &PA, outputs: &ListBox) {
.unwrap_or(&name), .unwrap_or(&name),
set_child: set_current_input_device = &Button { set_child: set_current_input_device = &Button {
set_label: "Switch", set_label: "Switch",
connect_clicked: move |_| { connect_clicked: clone!(@strong pa => move |_| {
// XXX Need mutable borrow? Is this a problem for async? pa.set_default_sink(&name);
/* })
SinkController::create()
.expect("failed to create output controller")
.set_default_device(&name)
.expect("failed to set default device");
*/
}
} }
} }
} }

10
applets/cosmic-applet-audio/src/pa.rs
View file

@ -144,12 +144,14 @@ impl PA {
receiver.await.unwrap() receiver.await.unwrap()
} }
/*
// XXX async wait and handle error // XXX async wait and handle error
pub fn set_default_sink(&mut self, name: &str) { pub fn set_default_sink(&self, name: &str) {
self.0.context.set_default_sink(name, |_| {}); self.0.context.borrow_mut().set_default_sink(name, |_| {});
}
pub fn set_default_source(&self, name: &str) {
self.0.context.borrow_mut().set_default_source(name, |_| {});
} }
*/
pub async fn get_source_info_list(&self) -> Result<Vec<DeviceInfo>, ()> { pub async fn get_source_info_list(&self) -> Result<Vec<DeviceInfo>, ()> {
let (sender, receiver) = oneshot::channel(); let (sender, receiver) = oneshot::channel();