mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-03 09:01:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "impl-node: run the remote driver node logic remotely"

Browse source 
This reverts commit 2f67a6a5b4.

This needs more work and makes easyeffects fail
This commit is contained in:
Wim Taymans 2023-05-22 13:12:38 +02:00
parent a14483ed61
commit a46076b207
4 changed files with 93 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1080,6 +1080,8 @@ static void node_on_data_fd_events(struct spa_source *source)
if (SPA_LIKELY(source->rmask & SPA_IO_IN)) {
uint64_t cmd;
struct pw_impl_node *node = impl->this.node;
struct pw_node_activation *a = node->rt.activation;
int status;
if (SPA_UNLIKELY(spa_system_eventfd_read(impl->data_system,
impl->data_source.fd, &cmd) < 0))
@ -1088,16 +1090,9 @@ static void node_on_data_fd_events(struct spa_source *source)
pw_log_info("(%s-%u) client missed %"PRIu64" wakeups",
node->name, node->info.id, cmd - 1);
if (impl->resource && impl->resource->version < 5) {
struct pw_node_activation *a = node->rt.activation;
int status = a->state[0].status;
spa_log_trace_fp(impl->log, "%p: got ready %d", impl, status);
spa_node_call_ready(&impl->callbacks, status);
} else {
spa_log_trace_fp(impl->log, "%p: got complete", impl);
pw_context_driver_emit_complete(node->context, node);
}
status = a->state[0].status;
spa_log_trace_fp(impl->log, "%p: got ready %d", impl, status);
spa_node_call_ready(&impl->callbacks, status);
}
}
@ -1207,6 +1202,9 @@ static void node_peer_added(void *data, struct pw_impl_node *peer)
struct impl *impl = data;
struct pw_memblock *m;
if (peer == impl->this.node)
return;
m = pw_mempool_import_block(impl->client->pool, peer->activation);
if (m == NULL) {
pw_log_debug("%p: can't ensure mem: %m", impl);
@ -1231,6 +1229,9 @@ static void node_peer_removed(void *data, struct pw_impl_node *peer)
struct impl *impl = data;
struct pw_memblock *m;
if (peer == impl->this.node)
return;
m = pw_mempool_find_fd(impl->client->pool, peer->activation->fd);
if (m == NULL) {
pw_log_warn("%p: unknown peer %p fd:%d", impl, peer,