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

node: process -> ready

Browse source 
Change the process callback to ready to avoid confusion with the
process method and it also describes better what happened.
This commit is contained in:
Wim Taymans 2019-02-14 17:04:59 +01:00
parent 8ae5424359
commit 3c78036a97
13 changed files with 28 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1139,8 +1139,9 @@ static void node_on_data_fd_events(struct spa_source *source)
if (read(this->data_source.fd, &cmd, sizeof(cmd)) != sizeof(cmd) || cmd != 1)
spa_log_warn(this->log, "node %p: read %"PRIu64" failed %m", this, cmd);
spa_log_trace(this->log, "node %p: got process", this);
this->callbacks->process(this->callbacks_data, SPA_STATUS_HAVE_BUFFER);
spa_log_trace(this->log, "node %p: got ready", this);
if (this->callbacks && this->callbacks->ready)
this->callbacks->ready(this->callbacks_data, SPA_STATUS_HAVE_BUFFER);
}
}

6
src/pipewire/node.c
View file

@ -908,12 +908,12 @@ static void node_event(void *data, struct spa_event *event)
}
static void node_process(void *data, int status)
static void node_ready(void *data, int status)
{
struct pw_node *node = data;
struct pw_node *driver = node->driver_node;
pw_log_trace("node %p: process driver:%d exported:%d %p", node,
pw_log_trace("node %p: ready driver:%d exported:%d %p", node,
node->driver, node->exported, driver);
if (driver->rt.root.graph == NULL)
@ -946,7 +946,7 @@ static const struct spa_node_callbacks node_callbacks = {
.info = node_info,
.done = node_done,
.event = node_event,
.process = node_process,
.ready = node_ready,
.reuse_buffer = node_reuse_buffer,
};

2
src/pipewire/stream.c
View file

@ -1294,7 +1294,7 @@ do_process(struct spa_loop *loop,
bool async, uint32_t seq, const void *data, size_t size, void *user_data)
{
struct stream *impl = user_data;
impl->callbacks->process(impl->callbacks_data, SPA_STATUS_HAVE_BUFFER);
impl->callbacks->ready(impl->callbacks_data, SPA_STATUS_HAVE_BUFFER);
return 0;
}