interface: add an interface structiface2

The interface struct has the type,version and methods of the
interface.
Make spa interfaces extend from spa_interface and make a
separate structure for the methods.
Pass a generic void* as the first argument of methods, like
we don in PipeWire.
Bundle the methods + implementation in a versioned inteface
and use that to invoke methods. This way we can do version
checks on the methods.
Make resource and proxy interfaces that we can can call. We
can then make the core interfaces independent on proxy/resource and
hide them in the lower layers.
Add add_listener method to methods of core interfaces, just
like SPA.

1 files changed, 47 insertions, 66 deletions

diff --git a/spa/plugins/bluez5/a2dp-source.c b/spa/plugins/bluez5/a2dp-source.c
index e2560d29..04f26bcc 100644
--- a/spa/plugins/bluez5/a2dp-source.c
+++ b/spa/plugins/bluez5/a2dp-source.c
@@ -132,22 +132,20 @@ static void reset_props(struct props *props)
 	props->max_latency = default_max_latency;
 }
 
-static int impl_node_enum_params(struct spa_node *node, int seq,
+static int impl_node_enum_params(void *object, int seq,
 			uint32_t id, uint32_t start, uint32_t num,
 			const struct spa_pod *filter)
 {
-	struct impl *this;
+	struct impl *this = object;
 	struct spa_pod *param;
 	struct spa_pod_builder b = { 0 };
 	uint8_t buffer[1024];
 	struct spa_result_node_params result;
 	uint32_t count = 0;
 
-	spa_return_val_if_fail(node != NULL, -EINVAL);
+	spa_return_val_if_fail(this != NULL, -EINVAL);
 	spa_return_val_if_fail(num != 0, -EINVAL);
 
-	this = SPA_CONTAINER_OF(node, struct impl, node);
-
         result.id = id;
 	result.next = start;
       next:
@@ -226,14 +224,12 @@ static inline bool is_slaved(struct impl *this)
 	return this->position && this->clock && this->position->clock.id != this->clock->id;
 }
 
-static int impl_node_set_io(struct spa_node *node, uint32_t id, void *data, size_t size)
+static int impl_node_set_io(void *object, uint32_t id, void *data, size_t size)
 {
-	struct impl *this;
+	struct impl *this = object;
 	bool slaved;
 
-	spa_return_val_if_fail(node != NULL, -EINVAL);
-
-	this = SPA_CONTAINER_OF(node, struct impl, node);
+	spa_return_val_if_fail(this != NULL, -EINVAL);
 
 	switch (id) {
 	case SPA_IO_Clock:
@@ -255,14 +251,12 @@ static int impl_node_set_io(struct spa_node *node, uint32_t id, void *data, size
 	return 0;
 }
 
-static int impl_node_set_param(struct spa_node *node, uint32_t id, uint32_t flags,
+static int impl_node_set_param(void *object, uint32_t id, uint32_t flags,
 			       const struct spa_pod *param)
 {
-	struct impl *this;
-
-	spa_return_val_if_fail(node != NULL, -EINVAL);
+	struct impl *this = object;
 
-	this = SPA_CONTAINER_OF(node, struct impl, node);
+	spa_return_val_if_fail(this != NULL, -EINVAL);
 
 	switch (id) {
 	case SPA_PARAM_Props:
@@ -531,16 +525,15 @@ static int do_stop(struct impl *this)
 	return res;
 }
 
-static int impl_node_send_command(struct spa_node *node, const struct spa_command *command)
+static int impl_node_send_command(void *object, const struct spa_command *command)
 {
-	struct impl *this;
+	struct impl *this = object;
 	struct port *port;
 	int res;
 
-	spa_return_val_if_fail(node != NULL, -EINVAL);
+	spa_return_val_if_fail(this != NULL, -EINVAL);
 	spa_return_val_if_fail(command != NULL, -EINVAL);
 
-	this = SPA_CONTAINER_OF(node, struct impl, node);
 	port = &this->port;
 
 	switch (SPA_NODE_COMMAND_ID(command)) {
@@ -591,17 +584,16 @@ static void emit_port_info(struct impl *this, struct port *port, bool full)
 }
 
 static int
-impl_node_add_listener(struct spa_node *node,
+impl_node_add_listener(void *object,
 		struct spa_hook *listener,
 		const struct spa_node_events *events,
 		void *data)
 {
-	struct impl *this;
+	struct impl *this = object;
 	struct spa_hook_list save;
 
-	spa_return_val_if_fail(node != NULL, -EINVAL);
+	spa_return_val_if_fail(this != NULL, -EINVAL);
 
-	this = SPA_CONTAINER_OF(node, struct impl, node);
 	spa_hook_list_isolate(&this->hooks, &save, listener, events, data);
 
 	emit_node_info(this, true);
@@ -613,40 +605,38 @@ impl_node_add_listener(struct spa_node *node,
 }
 
 static int
-impl_node_set_callbacks(struct spa_node *node,
+impl_node_set_callbacks(void *object,
 			const struct spa_node_callbacks *callbacks,
 			void *data)
 {
-	struct impl *this;
+	struct impl *this = object;
 
-	spa_return_val_if_fail(node != NULL, -EINVAL);
-
-	this = SPA_CONTAINER_OF(node, struct impl, node);
+	spa_return_val_if_fail(this != NULL, -EINVAL);
 
 	this->callbacks = SPA_CALLBACKS_INIT(callbacks, data);
 
 	return 0;
 }
 
-static int impl_node_add_port(struct spa_node *node, enum spa_direction direction, uint32_t port_id,
+static int impl_node_add_port(void *object, enum spa_direction direction, uint32_t port_id,
 		const struct spa_dict *props)
 {
 	return -ENOTSUP;
 }
 
-static int impl_node_remove_port(struct spa_node *node, enum spa_direction direction, uint32_t port_id)
+static int impl_node_remove_port(void *object, enum spa_direction direction, uint32_t port_id)
 {
 	return -ENOTSUP;
 }
 
 static int
-impl_node_port_enum_params(struct spa_node *node, int seq,
+impl_node_port_enum_params(void *object, int seq,
 			enum spa_direction direction, uint32_t port_id,
 			uint32_t id, uint32_t start, uint32_t num,
 			const struct spa_pod *filter)
 {
 
-	struct impl *this;
+	struct impl *this = object;
 	struct port *port;
 	struct spa_pod *param;
 	struct spa_pod_builder b = { 0 };
@@ -654,11 +644,9 @@ impl_node_port_enum_params(struct spa_node *node, int seq,
 	struct spa_result_node_params result;
 	uint32_t count = 0;
 
-	spa_return_val_if_fail(node != NULL, -EINVAL);
+	spa_return_val_if_fail(this != NULL, -EINVAL);
 	spa_return_val_if_fail(num != 0, -EINVAL);
 
-	this = SPA_CONTAINER_OF(node, struct impl, node);
-
 	spa_return_val_if_fail(CHECK_PORT(this, direction, port_id), -EINVAL);
 	port = &this->port;
 
@@ -828,17 +816,16 @@ static int port_set_format(struct impl *this, struct port *port,
 }
 
 static int
-impl_node_port_set_param(struct spa_node *node,
+impl_node_port_set_param(void *object,
 			 enum spa_direction direction, uint32_t port_id,
 			 uint32_t id, uint32_t flags,
 			 const struct spa_pod *param)
 {
-	struct impl *this;
+	struct impl *this = object;
 	struct port *port;
 	int res;
 
-	spa_return_val_if_fail(node != NULL, -EINVAL);
-	this = SPA_CONTAINER_OF(node, struct impl, node);
+	spa_return_val_if_fail(this != NULL, -EINVAL);
 
 	spa_return_val_if_fail(CHECK_PORT(node, direction, port_id), -EINVAL);
 	port = &this->port;
@@ -855,17 +842,15 @@ impl_node_port_set_param(struct spa_node *node,
 }
 
 static int
-impl_node_port_use_buffers(struct spa_node *node,
+impl_node_port_use_buffers(void *object,
 			   enum spa_direction direction,
 			   uint32_t port_id, struct spa_buffer **buffers, uint32_t n_buffers)
 {
-	struct impl *this;
+	struct impl *this = object;
 	struct port *port;
 	uint32_t i;
 
-	spa_return_val_if_fail(node != NULL, -EINVAL);
-
-	this = SPA_CONTAINER_OF(node, struct impl, node);
+	spa_return_val_if_fail(this != NULL, -EINVAL);
 
 	spa_return_val_if_fail(CHECK_PORT(this, direction, port_id), -EINVAL);
 	port = &this->port;
@@ -901,7 +886,7 @@ impl_node_port_use_buffers(struct spa_node *node,
 }
 
 static int
-impl_node_port_alloc_buffers(struct spa_node *node,
+impl_node_port_alloc_buffers(void *object,
 			     enum spa_direction direction,
 			     uint32_t port_id,
 			     struct spa_pod **params,
@@ -909,14 +894,12 @@ impl_node_port_alloc_buffers(struct spa_node *node,
 			     struct spa_buffer **buffers,
 			     uint32_t *n_buffers)
 {
-	struct impl *this;
+	struct impl *this = object;
 	struct port *port;
 
-	spa_return_val_if_fail(node != NULL, -EINVAL);
+	spa_return_val_if_fail(this != NULL, -EINVAL);
 	spa_return_val_if_fail(buffers != NULL, -EINVAL);
 
-	this = SPA_CONTAINER_OF(node, struct impl, node);
-
 	spa_return_val_if_fail(CHECK_PORT(this, direction, port_id), -EINVAL);
 	port = &this->port;
 
@@ -927,18 +910,16 @@ impl_node_port_alloc_buffers(struct spa_node *node,
 }
 
 static int
-impl_node_port_set_io(struct spa_node *node,
+impl_node_port_set_io(void *object,
 		      enum spa_direction direction,
 		      uint32_t port_id,
 		      uint32_t id,
 		      void *data, size_t size)
 {
-	struct impl *this;
+	struct impl *this = object;
 	struct port *port;
 
-	spa_return_val_if_fail(node != NULL, -EINVAL);
-
-	this = SPA_CONTAINER_OF(node, struct impl, node);
+	spa_return_val_if_fail(this != NULL, -EINVAL);
 
 	spa_return_val_if_fail(CHECK_PORT(this, direction, port_id), -EINVAL);
 	port = &this->port;
@@ -964,14 +945,12 @@ static void recycle_buffer(struct impl *this, struct port *port, uint32_t buffer
 	}
 }
 
-static int impl_node_port_reuse_buffer(struct spa_node *node, uint32_t port_id, uint32_t buffer_id)
+static int impl_node_port_reuse_buffer(void *object, uint32_t port_id, uint32_t buffer_id)
 {
-	struct impl *this;
+	struct impl *this = object;
 	struct port *port;
 
-	spa_return_val_if_fail(node != NULL, -EINVAL);
-
-	this = SPA_CONTAINER_OF(node, struct impl, node);
+	spa_return_val_if_fail(this != NULL, -EINVAL);
 
 	spa_return_val_if_fail(port_id == 0, -EINVAL);
 	port = &this->port;
@@ -987,17 +966,16 @@ static int impl_node_port_reuse_buffer(struct spa_node *node, uint32_t port_id,
 	return 0;
 }
 
-static int impl_node_process(struct spa_node *node)
+static int impl_node_process(void *object)
 {
-	struct impl *this;
+	struct impl *this = object;
 	struct port *port;
 	struct spa_io_buffers *io;
 	struct buffer *b;
 
 	/* get IO */
-	spa_return_val_if_fail(node != NULL, -EINVAL);
+	spa_return_val_if_fail(this != NULL, -EINVAL);
 
-	this = SPA_CONTAINER_OF(node, struct impl, node);
 	port = &this->port;
 	io = port->io;
 	spa_return_val_if_fail(io != NULL, -EIO);
@@ -1029,8 +1007,8 @@ static int impl_node_process(struct spa_node *node)
 	return SPA_STATUS_HAVE_BUFFER;
 }
 
-static const struct spa_node impl_node = {
-	SPA_VERSION_NODE,
+static const struct spa_node_methods impl_node = {
+	SPA_VERSION_NODE_METHODS,
 	.add_listener = impl_node_add_listener,
 	.set_callbacks = impl_node_set_callbacks,
 	.enum_params = impl_node_enum_params,
@@ -1136,7 +1114,10 @@ impl_init(const struct spa_handle_factory *factory,
 		return -EINVAL;
 	}
 
-	this->node = impl_node;
+	this->node.iface = SPA_INTERFACE_INIT(
+			SPA_TYPE_INTERFACE_Node,
+			SPA_VERSION_NODE,
+			&impl_node, this);
 	spa_hook_list_init(&this->hooks);
 
 	reset_props(&this->props);