Add getters for wireplumber plugins to manager.

Author: saivert

src/backend/manager.rs

@@ -32,6 +32,7 @@ mod imp {
     #[derive(Default, Properties)]
     #[properties(wrapper_type = super::PwvucontrolManager)]
     pub struct PwvucontrolManager {
+        #[property(get)]
         pub wp_core: OnceCell<wp::core::Core>,
         pub wp_object_manager: OnceCell<wp::registry::ObjectManager>,
 
@@ -43,6 +44,11 @@ mod imp {
         pub metadata_om: OnceCell<wp::registry::ObjectManager>,
         pub metadata: RefCell<Option<wp::pw::Metadata>>,
 
+        #[property(get)]
+        pub default_nodes_api: OnceCell<Plugin>,
+        #[property(get)]
+        pub mixer_api: OnceCell<Plugin>,
+
         #[property(get, set, construct_only)]
         application: RefCell<Option<PwvucontrolApplication>>,
     }
@@ -211,17 +217,19 @@ mod imp {
             }));
 
             glib::MainContext::default().spawn_local(clone!(@weak self as manager, @weak wp_core as core, @weak wp_om as om => async move {
-                let plugin_names = vec!["mixer-api", "default-nodes-api"];
+                let plugin_names = vec![("mixer-api", &manager.mixer_api), ("default-nodes-api", &manager.default_nodes_api)];
+
                 let mut count = 0;
-                for plugin_name in plugin_names {
+                for (plugin_name, plugin_cell) in plugin_names.iter() {
                     if let Some(plugin) = Plugin::find(&core, plugin_name) {
                         let result = plugin.activate_future(PluginFeatures::ENABLED).await;
                         if result.is_err() {
                             pwvucontrol_critical!("Cannot activate plugin {plugin_name}");
                         } else {
+                            plugin_cell.set(plugin).expect("Plugin not set");
                             pwvucontrol_info!("Activated plugin {plugin_name}");
                             count += 1;
-                            if count == 2 {
+                            if count == plugin_names.len() {
                                 core.install_object_manager(&om);
                             }
                         }

src/backend/pwnodeobject.rs

@@ -81,8 +81,6 @@ pub mod imp {
         #[property(get, set, construct_only)]
         pub(super) wpnode: OnceCell<wp::pw::Node>,
 
-        pub(super) mixerapi: OnceCell<wp::plugin::Plugin>,
-
         pub(super) block: Cell<bool>,
     }
 
@@ -104,7 +102,6 @@ pub mod imp {
                 format: Default::default(),
                 channellock: Default::default(),
                 wpnode: OnceCell::default(),
-                mixerapi: Default::default(),
                 block: Default::default()
             }
         }

src/backend/pwnodeobject/mixerapi.rs

@@ -10,16 +10,8 @@ use super::*;
 
 impl PwNodeObject {
     pub(crate) fn get_mixer_api(&self) {
-        let imp = self.imp();
-
         let manager = PwvucontrolManager::default();
-        let core = manager.imp().wp_core.get().expect("Core setup");
-
-        let mixerapi = wp::plugin::Plugin::find(core, "mixer-api").expect("Get mixer-api");
-
-        imp.mixerapi
-            .set(mixerapi)
-            .expect("mixerapi only set once in PwNodeObject");
+        let mixerapi = manager.mixer_api();
 
         let changed_handler = closure_local!(@watch self as widget => move |_mixerapi: &wp::plugin::Plugin, id: u32|{
             if id == widget.boundid() {
@@ -29,16 +21,14 @@ impl PwNodeObject {
             }
         });
 
-        imp.mixerapi.get().unwrap().connect_closure("changed", true, changed_handler);
+        mixerapi.connect_closure("changed", true, changed_handler);
     }
 
     pub(crate) fn send_volume_using_mixerapi(&self, what: PropertyChanged) {
         let imp = self.imp();
         let node = imp.wpnode.get().expect("node in send_volume");
-        let mixerapi = imp
-            .mixerapi
-            .get()
-            .expect("Mixer api must be set on PwNodeObject");
+        let manager = PwvucontrolManager::default();
+        let mixerapi = manager.mixer_api();
         let bound_id = node.bound_id();
         let result =
             mixerapi.emit_by_name::<Option<glib::Variant>>("get-volume", &[&node.bound_id()]);
@@ -110,11 +100,8 @@ impl PwNodeObject {
     }
 
     pub(crate) fn update_volume_using_mixerapi(&self) {
-        let mixerapi = self
-            .imp()
-            .mixerapi
-            .get()
-            .expect("Mixer api must be set on PwNodeObject");
+        let manager = PwvucontrolManager::default();
+        let mixerapi = manager.mixer_api();
         let node = self
             .imp()
             .wpnode

src/ui/volumebox.rs

@@ -153,9 +153,7 @@ mod imp {
 
             let manager = PwvucontrolManager::default();
 
-            let core = manager.imp().wp_core.get().expect("Core");
-            let defaultnodesapi =
-                wp::plugin::Plugin::find(core, "default-nodes-api").expect("Get mixer-api");
+            let defaultnodesapi = manager.default_nodes_api();
             let widget = self.obj();
             let defaultnodesapi_closure = closure_local!(@watch widget => move |defaultnodesapi: wp::plugin::Plugin| {
                 let id: u32 = defaultnodesapi.emit_by_name("get-default-node", &[&"Audio/Sink"]);