mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-04 13:30:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

port_mix: place io area in separate field

Browse source 
We would like to remove it from the spa_graph_port...
This commit is contained in:
Wim Taymans 2018-04-13 20:04:22 +02:00
parent adf8bc7804
commit fa07400c2e
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/modules/module-client-node/client-node.c
View file

@ -1202,12 +1202,14 @@ static int port_init_mix(void *data, struct pw_port_mix *mix)
mix->id = pw_map_insert_new(&impl->io_map, NULL); mix->id = pw_map_insert_new(&impl->io_map, NULL);
mix->port.io = SPA_MEMBER(impl->io_areas->ptr, mix->io = SPA_MEMBER(impl->io_areas->ptr,
mix->id * sizeof(struct spa_io_buffers), void); mix->id * sizeof(struct spa_io_buffers), void);
mix->port.io->buffer_id = SPA_ID_INVALID; mix->io->buffer_id = SPA_ID_INVALID;
mix->port.io->status = SPA_STATUS_NEED_BUFFER; mix->io->status = SPA_STATUS_NEED_BUFFER;
pw_log_debug("client-node %p: init mix io %d %p %p", impl, mix->id, mix->port.io, mix->port.io = mix->io;
pw_log_debug("client-node %p: init mix io %d %p %p", impl, mix->id, mix->io,
impl->io_areas->ptr); impl->io_areas->ptr);
return 0; return 0;
@ -1217,7 +1219,7 @@ static int port_release_mix(void *data, struct pw_port_mix *mix)
{ {
struct impl *impl = data; struct impl *impl = data;
pw_log_debug("client-node %p: remove mix io %d %p %p", impl, mix->id, mix->port.io, pw_log_debug("client-node %p: remove mix io %d %p %p", impl, mix->id, mix->io,
impl->io_areas->ptr); impl->io_areas->ptr);
pw_map_remove(&impl->io_map, mix->id); pw_map_remove(&impl->io_map, mix->id);

1
src/pipewire/private.h
View file

@ -286,6 +286,7 @@ struct pw_node {
struct pw_port_mix { struct pw_port_mix {
struct spa_graph_port port; struct spa_graph_port port;
struct spa_io_buffers *io;
struct spa_buffer **buffers; struct spa_buffer **buffers;
uint32_t n_buffers; uint32_t n_buffers;
uint32_t id; uint32_t id;