1 files changed, 16 insertions, 14 deletions

diff --git a/src/extensions/client-node.h b/src/extensions/client-node.h
index b238d1a3..2c7bed60 100644
--- a/src/extensions/client-node.h
+++ b/src/extensions/client-node.h
@@ -32,7 +32,7 @@ extern "C" {
 
 #include <pipewire/proxy.h>
 
-typedef struct pw_proxy pw_client_node_proxy_t;
+struct pw_client_node_proxy { struct pw_proxy proxy; };
 
 #define PW_TYPE_INTERFACE__ClientNode		PW_TYPE_INTERFACE_BASE "ClientNode"
 
@@ -120,26 +120,26 @@ struct pw_client_node_methods {
 };
 
 static inline void
-pw_client_node_proxy_done(pw_client_node_proxy_t *p, int seq, int res)
+pw_client_node_proxy_done(struct pw_client_node_proxy *p, int seq, int res)
 {
-        pw_proxy_do(p, struct pw_client_node_methods, done, seq, res);
+        pw_proxy_do(&p->proxy, struct pw_client_node_methods, done, seq, res);
 }
 
 static inline void
-pw_client_node_proxy_update(pw_client_node_proxy_t *p,
+pw_client_node_proxy_update(struct pw_client_node_proxy *p,
 			    uint32_t change_mask,
 			    uint32_t max_input_ports,
 			    uint32_t max_output_ports,
 			    const struct spa_props *props)
 {
-        pw_proxy_do(p, struct pw_client_node_methods, update, change_mask,
+        pw_proxy_do(&p->proxy, struct pw_client_node_methods, update, change_mask,
 							      max_input_ports,
 							      max_output_ports,
 							      props);
 }
 
 static inline void
-pw_client_node_proxy_port_update(pw_client_node_proxy_t *p,
+pw_client_node_proxy_port_update(struct pw_client_node_proxy *p,
 				 enum spa_direction direction,
 				 uint32_t port_id,
 				 uint32_t change_mask,
@@ -150,7 +150,7 @@ pw_client_node_proxy_port_update(pw_client_node_proxy_t *p,
 				 const struct spa_param **params,
 				 const struct spa_port_info *info)
 {
-        pw_proxy_do(p, struct pw_client_node_methods, port_update, direction,
+        pw_proxy_do(&p->proxy, struct pw_client_node_methods, port_update, direction,
 								   port_id,
 								   change_mask,
 								   n_possible_formats,
@@ -162,15 +162,15 @@ pw_client_node_proxy_port_update(pw_client_node_proxy_t *p,
 }
 
 static inline void
-pw_client_node_proxy_event(pw_client_node_proxy_t *p, struct spa_event *event)
+pw_client_node_proxy_event(struct pw_client_node_proxy *p, struct spa_event *event)
 {
-        pw_proxy_do(p, struct pw_client_node_methods, event, event);
+        pw_proxy_do(&p->proxy, struct pw_client_node_methods, event, event);
 }
 
 static inline void
-pw_client_node_proxy_destroy(pw_client_node_proxy_t *p)
+pw_client_node_proxy_destroy(struct pw_client_node_proxy *p)
 {
-        pw_proxy_do_na(p, struct pw_client_node_methods, destroy);
+        pw_proxy_do_na(&p->proxy, struct pw_client_node_methods, destroy);
 }
 
 
@@ -338,10 +338,12 @@ struct pw_client_node_events {
 };
 
 static inline void
-pw_client_node_proxy_add_listener(pw_client_node_proxy_t *p, void *object,
-				  const struct pw_client_node_events *listener, pw_destroy_t destroy)
+pw_client_node_proxy_add_listener(struct pw_client_node_proxy *p,
+				  struct pw_interface_listener *listener,
+				  void *object,
+				  const struct pw_client_node_events *events)
 {
-        pw_proxy_add_listener(p, object, listener, destroy);
+        pw_proxy_add_listener(&p->proxy, listener, object, events);
 }
 
 #define pw_client_node_resource_transport(r,...)    pw_resource_notify(r,struct pw_client_node_events,transport,__VA_ARGS__)