port: Use glib::properties derive macro for properties

This commit is contained in:
Tom A. Wagner
2023-08-01 09:09:57 +02:00
parent 27b76b0fe1
commit 7a9bc84b8b

View File

@@ -38,16 +38,25 @@ struct ForwardLink(u32);
struct ReversedLink(u32); struct ReversedLink(u32);
mod imp { mod imp {
use glib::ParamFlags; use super::*;
use once_cell::{sync::Lazy, unsync::OnceCell}; use once_cell::{sync::Lazy, unsync::OnceCell};
use pipewire::spa::Direction; use pipewire::spa::Direction;
use super::*;
/// Graphical representation of a pipewire port. /// Graphical representation of a pipewire port.
#[derive(Default)] #[derive(Default, glib::Properties)]
#[properties(wrapper_type = super::Port)]
pub struct Port { pub struct Port {
#[property(get, set, construct_only)]
pub(super) pipewire_id: OnceCell<u32>, pub(super) pipewire_id: OnceCell<u32>,
#[property(
name = "name", type = String,
get = |this: &Self| this.label.text().to_string(),
set = |this: &Self, val| {
this.label.set_text(val);
this.label.set_tooltip_text(Some(val));
}
)]
pub(super) label: gtk::Label, pub(super) label: gtk::Label,
pub(super) direction: OnceCell<Direction>, pub(super) direction: OnceCell<Direction>,
} }
@@ -82,35 +91,15 @@ mod imp {
} }
fn properties() -> &'static [glib::ParamSpec] { fn properties() -> &'static [glib::ParamSpec] {
static PROPERTIES: Lazy<Vec<glib::ParamSpec>> = Lazy::new(|| { Self::derived_properties()
vec![
glib::ParamSpecUInt::builder("pipewire-id")
.flags(ParamFlags::READWRITE | ParamFlags::CONSTRUCT_ONLY)
.build(),
glib::ParamSpecString::builder("name").build(),
]
});
PROPERTIES.as_ref()
} }
fn property(&self, _id: usize, pspec: &glib::ParamSpec) -> glib::Value { fn property(&self, id: usize, pspec: &glib::ParamSpec) -> glib::Value {
match pspec.name() { Self::derived_property(self, id, pspec)
"pipewire-id" => self.pipewire_id.get().unwrap().to_value(),
"name" => self.label.text().to_value(),
_ => unimplemented!(),
}
} }
fn set_property(&self, _id: usize, value: &glib::Value, pspec: &glib::ParamSpec) { fn set_property(&self, id: usize, value: &glib::Value, pspec: &glib::ParamSpec) {
match pspec.name() { Self::derived_set_property(self, id, value, pspec)
"name" => {
self.label.set_text(value.get().unwrap());
self.label.set_tooltip_text(value.get().ok());
}
"pipewire-id" => self.pipewire_id.set(value.get().unwrap()).unwrap(),
_ => unimplemented!(),
}
} }
fn signals() -> &'static [Signal] { fn signals() -> &'static [Signal] {
@@ -228,20 +217,6 @@ impl Port {
res res
} }
pub fn pipewire_id(&self) -> u32 {
self.property("pipewire-id")
}
/// Get the nodes `name` property, which represents the displayed name.
pub fn name(&self) -> String {
self.property("name")
}
/// Set the nodes `name` property, which represents the displayed name.
pub fn set_name(&self, name: &str) {
self.set_property("name", name);
}
pub fn direction(&self) -> &Direction { pub fn direction(&self) -> &Direction {
self.imp() self.imp()
.direction .direction