mirror of
https://gitlab.freedesktop.org/pipewire/helvum
synced 2026-03-15 11:36:11 +08:00
fix clippy warnings
This commit is contained in:
committed by
Tom A. Wagner
parent
99b2ef274a
commit
5784275d32
@@ -49,7 +49,7 @@ impl PipewireConnection {
|
||||
.register();
|
||||
|
||||
Ok(Self {
|
||||
mainloop: mainloop,
|
||||
mainloop,
|
||||
_context: context,
|
||||
core,
|
||||
_registry: registry,
|
||||
|
||||
@@ -40,12 +40,10 @@ pub struct PipewireState {
|
||||
|
||||
impl PipewireState {
|
||||
pub fn new(graphview: Rc<RefCell<view::GraphView>>) -> Self {
|
||||
let result = Self {
|
||||
Self {
|
||||
graphview,
|
||||
items: HashMap::new(),
|
||||
};
|
||||
|
||||
result
|
||||
}
|
||||
}
|
||||
|
||||
/// This function is called from the `PipewireConnection` struct responsible for updating this struct.
|
||||
@@ -66,18 +64,20 @@ impl PipewireState {
|
||||
|
||||
fn add_node(&mut self, node: GlobalObject) {
|
||||
// Update graph to contain the new node.
|
||||
let node_widget = crate::view::Node::new(&format!(
|
||||
"{}",
|
||||
node.props
|
||||
let node_widget = crate::view::Node::new(
|
||||
&node
|
||||
.props
|
||||
.as_ref()
|
||||
.map(|dict| String::from(
|
||||
dict.get("node.nick")
|
||||
.or(dict.get("node.description"))
|
||||
.or(dict.get("node.name"))
|
||||
.unwrap_or_default()
|
||||
))
|
||||
.unwrap_or_default()
|
||||
));
|
||||
.map(|dict| {
|
||||
String::from(
|
||||
dict.get("node.nick")
|
||||
.or_else(|| dict.get("node.description"))
|
||||
.or_else(|| dict.get("node.name"))
|
||||
.unwrap_or_default(),
|
||||
)
|
||||
})
|
||||
.unwrap_or_default(),
|
||||
);
|
||||
|
||||
// FIXME: This relies on the node being passed to us by the pipwire server before its port.
|
||||
let media_type = node
|
||||
@@ -115,7 +115,7 @@ impl PipewireState {
|
||||
fn add_port(&mut self, port: GlobalObject) {
|
||||
// Update graph to contain the new port.
|
||||
let props = port.props.expect("Port object is missing properties");
|
||||
let port_label = format!("{}", props.get("port.name").unwrap_or_default());
|
||||
let port_label = props.get("port.name").unwrap_or_default().to_string();
|
||||
let node_id: u32 = props
|
||||
.get("node.id")
|
||||
.expect("Port has no node.id property!")
|
||||
|
||||
@@ -273,3 +273,9 @@ impl GraphView {
|
||||
self.queue_draw();
|
||||
}
|
||||
}
|
||||
|
||||
impl Default for GraphView {
|
||||
fn default() -> Self {
|
||||
Self::new()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -135,11 +135,7 @@ impl Node {
|
||||
|
||||
pub fn get_port(&self, id: u32) -> Option<Rc<super::port::Port>> {
|
||||
let private = imp::Node::from_instance(self);
|
||||
private
|
||||
.ports
|
||||
.borrow_mut()
|
||||
.get(&id)
|
||||
.map(|port_rc| port_rc.clone())
|
||||
private.ports.borrow_mut().get(&id).cloned()
|
||||
}
|
||||
|
||||
pub fn remove_port(&self, id: u32) {
|
||||
|
||||
Reference in New Issue
Block a user