Rename enum to make it more clear and fix wrong match arms.

Author: saivert

src/backend/pwdeviceobject.rs

@@ -15,13 +15,11 @@ use wp::{
 
 use crate::macros::*;
 use once_cell::sync::{Lazy, OnceCell};
+use super::{PwRouteFilterModel, PwRouteObject, RouteDirection};
 use std::cell::{Cell, RefCell};
 
-use super::PwRouteObject;
-use crate::backend::RouteDirection;
-use crate::backend::PwRouteFilterModel;
-
 pub mod imp {
+
     use super::*;
 
     #[derive(Properties)]
@@ -110,8 +108,8 @@ pub mod imp {
         fn constructed(&self) {
             self.parent_constructed();
 
-            self.routemodel_input.set_model(Some(self.routemodel.clone()));
-            self.routemodel_output.set_model(Some(self.routemodel.clone()));
+            self.routemodel_input.set_model(Some(self.routemodel.as_ref()));
+            self.routemodel_output.set_model(Some(self.routemodel.as_ref()));
 
             let obj = self.obj();
 
@@ -344,9 +342,14 @@ impl PwDeviceObject {
                         RouteDirection::Output => self.set_route_index_output(modelindex),
                         _ => unreachable!()
                     }
-                    break;
-                } else {
-                    pwvucontrol_critical!("Unable to get model index from route index in update_current_route_index_for_direction_sync");
+                //     match direction {
+                //         RouteDirection::Input => self.imp().route_index_input.set(modelindex),
+                //         RouteDirection::Output => self.imp().route_index_output.set(modelindex),
+                //         _ => unreachable!()
+                //     }
+                //     self.emit_by_name::<()>("post-update-route", &[]);
+                // } else {
+                    pwvucontrol_critical!("{direction:?} Unable to get model index from route index in update_current_route_index_for_direction_sync");
                 };
             }
         }
@@ -355,12 +358,19 @@ impl PwDeviceObject {
     fn get_model_index_from_route_index(&self, direction: RouteDirection, routeindex: i32) -> Option<u32> {
         let routemodel = self.get_route_model_for_direction(direction);
 
-        for a in routemodel.iter::<PwRouteObject>().enumerate() {
-            if let Ok(b) = a.1 {
+        pwvucontrol_info!("{direction:?} routemodel.n_items = {}, routeindex = {routeindex}", routemodel.n_items());
+        for (i, x) in routemodel.iter::<PwRouteObject>().map_while(Result::ok).enumerate() {
+            pwvucontrol_info!("{direction:?} #{i} item.index = {}, item.description = {}", x.index(), x.description());
+        }
+
+        for (i, o) in routemodel.iter::<PwRouteObject>().enumerate() {
+            if let Ok(obj) = o {
                 //let b: PwRouteObject = b.downcast().expect("PwRouteObject");
-                if b.index() == routeindex as u32 {
-                    return Some(a.0 as u32);
+                if obj.index() as u32 == routeindex as u32 {
+                    return Some(i as u32);
                 }
+            } else {
+                pwvucontrol_critical!("model mutated while iterating, returning None");
             }
         }
         None

src/backend/pwnodeobject.rs

@@ -21,8 +21,8 @@ mod mixerapi;
 pub enum NodeType {
     #[default]
     Undefined,
-    Input,
-    Output,
+    StreamInput,
+    StreamOutput,
     Sink,
     Source,
 }
@@ -215,8 +215,8 @@ glib::wrapper! {
 
 pub(crate) fn get_node_type_for_node(node: &wp::pw::Node) -> NodeType {
     match node.get_pw_property("media.class").as_deref() {
-        Some("Stream/Output/Audio") => NodeType::Output,
-        Some("Stream/Input/Audio") => NodeType::Input,
+        Some("Stream/Output/Audio") => NodeType::StreamOutput,
+        Some("Stream/Input/Audio") => NodeType::StreamInput,
         Some("Audio/Source") => NodeType::Source,
         Some("Audio/Sink") => NodeType::Sink,
         _ => NodeType::Undefined,
@@ -281,7 +281,7 @@ impl PwNodeObject {
 
     fn update_icon_name(&self) {
         match self.nodetype() {
-            NodeType::Input | NodeType::Output => {
+            NodeType::StreamInput | NodeType::StreamOutput => {
                 self.set_iconname("library-music-symbolic");
                 let icon_props = ["media.icon-name", "window.icon-name", "application.icon-name"];
                 for prop in icon_props {

src/backend/pwroutefiltermodel.rs

@@ -1,16 +1,12 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-use glib::{Properties, closure_local};
-use glib::subclass::prelude::*;
+use glib::{closure_local, subclass::prelude::*, Properties};
 use gtk::{gio, prelude::*, subclass::prelude::*};
 use std::cell::{Cell, RefCell};
 use im_rc::Vector;
-use super::{PwRouteObject, RouteDirection};
+use super::{ParamAvailability, PwRouteObject, RouteDirection};
 
 mod imp {
-
-    use crate::backend::ParamAvailability;
-
     use super::*;
 
     #[derive(Debug, Properties, Default)]
@@ -23,7 +19,7 @@ mod imp {
         pub(super) direction: Cell<RouteDirection>,
 
         /// The model we are filtering.
-        #[property(get, set = Self::set_model, nullable )]
+        #[property(get, set = Self::set_model, nullable)]
         pub(super) model: RefCell<Option<gio::ListModel>>,
     }
 
@@ -54,7 +50,7 @@ mod imp {
     }
 
     impl PwRouteFilterModel {
-        pub fn set_model(&self, new_model: Option<gio::ListModel>) {
+        pub fn set_model(&self, new_model: Option<&gio::ListModel>) {
             let removed = self.filtered_model.borrow().len() as u32;
 
             if let Some(new_model) = new_model {
@@ -63,7 +59,6 @@ mod imp {
 
                 let widget = self.obj();
                 let handler = closure_local!(@watch widget => move |listmodel: &gio::ListModel, _position: u32, _removed: u32, _added: u32| {
-    
                     let u: Vector<PwRouteObject> = listmodel.iter::<PwRouteObject>()
                         .map_while(Result::ok)
                         .filter(|routeobject| {
@@ -78,13 +73,14 @@ mod imp {
                         filtered_model.append(u);
                         filtered_model.len() as u32
                     };
-                    widget.items_changed(0, removed, added)
+                    widget.items_changed(0, removed, added);
                 });
                 handler.invoke::<()>(&[&new_model, &0u32, &0u32, &0u32]);
                 new_model.connect_closure("items-changed", true, handler);
 
                 self.model.replace(Some(new_model.clone().upcast()));
             } else {
+                self.filtered_model.borrow_mut().clear();
                 self.obj().items_changed(0, removed, 0);
             }
         }

src/ui/route_dropdown.rs

@@ -56,8 +56,8 @@ mod imp {
 
             let deviceobject = nodeobject.get_device().expect("device");
             match nodeobject.nodetype() {
-                NodeType::Input => Some(deviceobject.route_index_input()),
-                NodeType::Output => Some(deviceobject.route_index_output()),
+                NodeType::Source => Some(deviceobject.route_index_input()),
+                NodeType::Sink => Some(deviceobject.route_index_output()),
                 _ => None
             }
         }

src/ui/window.rs

@@ -110,7 +110,7 @@ mod imp {
 
             let filter = gtk::CustomFilter::new(|x| {
                 if let Some(o) = x.downcast_ref::<PwNodeObject>() {
-                    return o.nodetype() == NodeType::Output;
+                    return o.nodetype() == NodeType::StreamOutput;
                 }
                 false
             });
@@ -129,7 +129,7 @@ mod imp {
 
             let filter = gtk::CustomFilter::new(|x| {
                 if let Some(o) = x.downcast_ref::<PwNodeObject>() {
-                    return o.nodetype() == NodeType::Input;
+                    return o.nodetype() == NodeType::StreamInput;
                 }
                 false
             });