mirror of
https://gitlab.freedesktop.org/pipewire/pipewire.git
synced 2025-12-22 08:56:59 -05:00
Cleanups
Make separate _register function so that we can first configure the object before making it publicly visible.
This commit is contained in:
parent
67d4dd8656
commit
f64c28c091
25 changed files with 131 additions and 99 deletions
|
|
@ -473,11 +473,11 @@ static void make_node(struct data *data)
|
|||
if (data->path)
|
||||
pw_properties_set(props, "pipewire.target.node", data->path);
|
||||
|
||||
data->node = pw_node_new(data->core, NULL, NULL, "SDL-sink", props, 0);
|
||||
data->node = pw_node_new(data->core, "SDL-sink", props, 0);
|
||||
data->impl_node = impl_node;
|
||||
pw_node_set_implementation(data->node, &data->impl_node);
|
||||
|
||||
pw_node_register(data->node);
|
||||
pw_node_register(data->node, NULL, NULL);
|
||||
|
||||
pw_remote_export(data->remote, data->node);
|
||||
}
|
||||
|
|
@ -519,8 +519,6 @@ int main(int argc, char *argv[])
|
|||
data.remote = pw_remote_new(data.core, NULL, 0);
|
||||
data.path = argc > 1 ? argv[1] : NULL;
|
||||
|
||||
pw_module_load(data.core, "libpipewire-module-spa-node-factory", NULL);
|
||||
|
||||
init_type(&data.type, data.t->map);
|
||||
|
||||
spa_debug_set_type_map(data.t->map);
|
||||
|
|
|
|||
|
|
@ -367,11 +367,11 @@ static void make_node(struct data *data)
|
|||
if (data->path)
|
||||
pw_properties_set(props, "pipewire.target.node", data->path);
|
||||
|
||||
data->node = pw_node_new(data->core, NULL, NULL, "sine-source", props, 0);
|
||||
data->node = pw_node_new(data->core, "sine-source", props, 0);
|
||||
data->impl_node = impl_node;
|
||||
pw_node_set_implementation(data->node, &data->impl_node);
|
||||
|
||||
pw_node_register(data->node);
|
||||
pw_node_register(data->node, NULL, NULL);
|
||||
|
||||
pw_remote_export(data->remote, data->node);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -450,11 +450,11 @@ static void make_nodes(struct data *data)
|
|||
struct pw_factory *factory;
|
||||
struct pw_properties *props;
|
||||
|
||||
data->node = pw_node_new(data->core, NULL, NULL, "SDL-sink", NULL, 0);
|
||||
data->node = pw_node_new(data->core, "SDL-sink", NULL, 0);
|
||||
data->impl_node = impl_node;
|
||||
pw_node_set_implementation(data->node, &data->impl_node);
|
||||
|
||||
pw_node_register(data->node);
|
||||
pw_node_register(data->node, NULL, NULL);
|
||||
|
||||
factory = pw_core_find_factory(data->core, "spa-node-factory");
|
||||
props = pw_properties_new("spa.library.name", "v4l2/libspa-v4l2",
|
||||
|
|
@ -467,13 +467,13 @@ static void make_nodes(struct data *data)
|
|||
SPA_ID_INVALID);
|
||||
|
||||
data->link = pw_link_new(data->core,
|
||||
NULL,
|
||||
pw_node_get_free_port(data->v4l2, PW_DIRECTION_OUTPUT),
|
||||
pw_node_find_port(data->node, PW_DIRECTION_INPUT, 0),
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
0);
|
||||
pw_link_register(data->link, NULL, NULL);
|
||||
pw_link_activate(data->link);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue