Add getter for metadata object.

saivert · May 10, 2024 · ac9da6a · ac9da6a
1 parent fad5cba
commit ac9da6a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/src/backend/manager.rs b/src/backend/manager.rs
@@ -50,6 +50,7 @@ mod imp {
         pub(crate) device_model: gio::ListStore,
 
         pub metadata_om: OnceCell<wp::registry::ObjectManager>,
+        #[property(get)]
         pub metadata: RefCell<Option<wp::pw::Metadata>>,
 
         #[property(get)]

diff --git a/src/backend/pwnodeobject.rs b/src/backend/pwnodeobject.rs
@@ -474,7 +474,7 @@ impl PwNodeObject {
 
         let manager = PwvucontrolManager::default();
 
-        if let Some(metadata) = manager.imp().metadata.borrow().as_ref() {
+        if let Some(metadata) = manager.metadata() {
             metadata.set(self.boundid(), Some("target.node"), Some("Spa:Id"), Some(&target_node.boundid().to_string()));
             metadata.set(self.boundid(), Some("target.object"), Some("Spa:Id"), Some(&target_node.serial().to_string()));
         } else {
@@ -510,7 +510,7 @@ impl PwNodeObject {
         let manager = PwvucontrolManager::default();
 
         let om = manager.imp().wp_object_manager.get().unwrap();
-        if let Some(metadata) = manager.imp().metadata.borrow().as_ref() {
+        if let Some(metadata) = manager.metadata() {
             if let Some(target_serial) = metadata.find_notype(self.boundid(), "target.object") {
                 if target_serial != "-1" {
                     if let Some(sinknode) = om.lookup([
@@ -545,7 +545,7 @@ impl PwNodeObject {
     pub(crate) fn unset_default_target(&self) {
         let manager = PwvucontrolManager::default();
 
-        if let Some(metadata) = manager.imp().metadata.borrow().as_ref() {
+        if let Some(metadata) = manager.metadata() {
             metadata.set(self.boundid(), Some("target.node"), Some("Spa:Id"), Some("-1"));
             metadata.set(self.boundid(), Some("target.object"), Some("Spa:Id"), Some("-1"));
         } else {

diff --git a/src/ui/volumebox.rs b/src/ui/volumebox.rs
@@ -191,7 +191,7 @@ mod imp {
         fn dispose(&self) {
             if let Some(sid) = self.metadata_changed_event.take() {
                 let manager = PwvucontrolManager::default();
-                if let Some(metadata) = manager.imp().metadata.borrow().as_ref() {
+                if let Some(metadata) = manager.metadata() {
                     metadata.disconnect(sid);
                 };
             };