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

stream: rename variable

Browse source
This commit is contained in:
Wim Taymans 2020-06-03 11:08:35 +02:00
parent 203c89daaf
commit 94cbb54517
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/pipewire/filter.c
View file

@ -140,7 +140,7 @@ struct filter {
struct pw_time time; struct pw_time time;
unsigned int disconnecting:1; unsigned int disconnecting:1;
unsigned int free_proxy:1; unsigned int disconnect_core:1;
unsigned int subscribe:1; unsigned int subscribe:1;
unsigned int draining:1; unsigned int draining:1;
unsigned int allow_mlock:1; unsigned int allow_mlock:1;
@ -1232,7 +1232,7 @@ pw_filter_connect(struct pw_filter *filter,
spa_list_append(&filter->core->filter_list, &filter->link); spa_list_append(&filter->core->filter_list, &filter->link);
pw_core_add_listener(filter->core, pw_core_add_listener(filter->core,
&filter->core_listener, &core_events, filter); &filter->core_listener, &core_events, filter);
impl->free_proxy = true; impl->disconnect_core = true;
} }
pw_log_debug(NAME" %p: export node %p", filter, &impl->impl_node); pw_log_debug(NAME" %p: export node %p", filter, &impl->impl_node);
@ -1272,8 +1272,8 @@ int pw_filter_disconnect(struct pw_filter *filter)
if (filter->proxy) if (filter->proxy)
pw_proxy_destroy(filter->proxy); pw_proxy_destroy(filter->proxy);
if (impl->free_proxy) { if (impl->disconnect_core) {
impl->free_proxy = false; impl->disconnect_core = false;
spa_hook_remove(&filter->core_listener); spa_hook_remove(&filter->core_listener);
spa_list_remove(&filter->link); spa_list_remove(&filter->link);
pw_core_disconnect(filter->core); pw_core_disconnect(filter->core);

8
src/pipewire/stream.c
View file

@ -131,7 +131,7 @@ struct stream {
struct pw_time time; struct pw_time time;
unsigned int disconnecting:1; unsigned int disconnecting:1;
unsigned int free_proxy:1; unsigned int disconnect_core:1;
unsigned int draining:1; unsigned int draining:1;
unsigned int drained:1; unsigned int drained:1;
unsigned int allow_mlock:1; unsigned int allow_mlock:1;
@ -1486,7 +1486,7 @@ pw_stream_connect(struct pw_stream *stream,
spa_list_append(&stream->core->stream_list, &stream->link); spa_list_append(&stream->core->stream_list, &stream->link);
pw_core_add_listener(stream->core, pw_core_add_listener(stream->core,
&stream->core_listener, &core_events, stream); &stream->core_listener, &core_events, stream);
impl->free_proxy = true; impl->disconnect_core = true;
} }
pw_log_debug(NAME" %p: creating node", stream); pw_log_debug(NAME" %p: creating node", stream);
@ -1577,8 +1577,8 @@ int pw_stream_disconnect(struct pw_stream *stream)
pw_impl_node_destroy(impl->node); pw_impl_node_destroy(impl->node);
impl->node = NULL; impl->node = NULL;
} }
if (impl->free_proxy) { if (impl->disconnect_core) {
impl->free_proxy = false; impl->disconnect_core = false;
spa_hook_remove(&stream->core_listener); spa_hook_remove(&stream->core_listener);
spa_list_remove(&stream->link); spa_list_remove(&stream->link);
pw_core_disconnect(stream->core); pw_core_disconnect(stream->core);