diff --git a/spa/plugins/audioconvert/audioconvert.c b/spa/plugins/audioconvert/audioconvert.c index 7c761ec16..c588e89b5 100644 --- a/spa/plugins/audioconvert/audioconvert.c +++ b/spa/plugins/audioconvert/audioconvert.c @@ -59,7 +59,7 @@ struct link { uint32_t min_buffers; uint32_t n_buffers; struct spa_buffer **buffers; - int negotiated:1; + unsigned int negotiated:1; }; struct impl { @@ -90,7 +90,7 @@ struct impl { struct spa_node *resample; struct spa_hook listener[4]; - int listening:1; + unsigned int listening:1; }; static int make_link(struct impl *this, diff --git a/spa/plugins/audioconvert/channelmix-ops.h b/spa/plugins/audioconvert/channelmix-ops.h index 0ca887d7c..48b191b58 100644 --- a/spa/plugins/audioconvert/channelmix-ops.h +++ b/spa/plugins/audioconvert/channelmix-ops.h @@ -50,7 +50,7 @@ struct channelmix { struct spa_log *log; - int is_identity:1; + unsigned int is_identity:1; float volume; float matrix[MAX_CHANNELS * MAX_CHANNELS]; diff --git a/spa/plugins/audioconvert/channelmix.c b/spa/plugins/audioconvert/channelmix.c index 7db152605..5f7bd9acd 100644 --- a/spa/plugins/audioconvert/channelmix.c +++ b/spa/plugins/audioconvert/channelmix.c @@ -117,8 +117,8 @@ struct impl { struct port out_port; struct channelmix mix; - int started:1; - int is_passthrough:1; + unsigned int started:1; + unsigned int is_passthrough:1; uint32_t cpu_flags; }; diff --git a/spa/plugins/audioconvert/fmt-ops.h b/spa/plugins/audioconvert/fmt-ops.h index d9dcd5780..ee326576e 100644 --- a/spa/plugins/audioconvert/fmt-ops.h +++ b/spa/plugins/audioconvert/fmt-ops.h @@ -85,7 +85,7 @@ struct convert { uint32_t n_channels; uint32_t cpu_flags; - int is_passthrough:1; + unsigned int is_passthrough:1; float ns_data[MAX_NS]; uint32_t ns_idx; uint32_t ns_size; diff --git a/spa/plugins/audioconvert/fmtconvert.c b/spa/plugins/audioconvert/fmtconvert.c index 5326deb03..077006ac3 100644 --- a/spa/plugins/audioconvert/fmtconvert.c +++ b/spa/plugins/audioconvert/fmtconvert.c @@ -121,7 +121,7 @@ struct impl { uint32_t cpu_flags; struct convert conv; - int is_passthrough:1; + unsigned int is_passthrough:1; }; #define CHECK_PORT(this,d,id) (id == 0) diff --git a/spa/plugins/audioconvert/merger.c b/spa/plugins/audioconvert/merger.c index 670dabae8..e5e89d17f 100644 --- a/spa/plugins/audioconvert/merger.c +++ b/spa/plugins/audioconvert/merger.c @@ -104,10 +104,10 @@ struct impl { struct convert conv; uint32_t cpu_flags; - int is_passthrough:1; - int started:1; - int monitor:1; - int have_profile:1; + unsigned int is_passthrough:1; + unsigned int started:1; + unsigned int monitor:1; + unsigned int have_profile:1; float empty[MAX_SAMPLES + 15]; }; diff --git a/spa/plugins/audioconvert/resample.c b/spa/plugins/audioconvert/resample.c index 33764b64b..9e1943651 100644 --- a/spa/plugins/audioconvert/resample.c +++ b/spa/plugins/audioconvert/resample.c @@ -85,7 +85,7 @@ struct port { uint32_t stride; uint32_t blocks; uint32_t size; - int have_format:1; + unsigned int have_format:1; struct buffer buffers[MAX_BUFFERS]; uint32_t n_buffers; @@ -110,8 +110,8 @@ struct impl { struct port in_port; struct port out_port; - int started:1; - int monitor:1; + unsigned int started:1; + unsigned int monitor:1; struct resample resample; }; diff --git a/spa/plugins/audioconvert/splitter.c b/spa/plugins/audioconvert/splitter.c index 50cbefa0c..f00816020 100644 --- a/spa/plugins/audioconvert/splitter.c +++ b/spa/plugins/audioconvert/splitter.c @@ -106,8 +106,8 @@ struct impl { uint32_t cpu_flags; struct convert conv; - int is_passthrough:1; - int started:1; + unsigned int is_passthrough:1; + unsigned int started:1; bool have_profile; diff --git a/spa/plugins/audiomixer/audiomixer.c b/spa/plugins/audiomixer/audiomixer.c index 4d6746871..bf8947d31 100644 --- a/spa/plugins/audiomixer/audiomixer.c +++ b/spa/plugins/audiomixer/audiomixer.c @@ -80,8 +80,8 @@ struct port { struct spa_port_info info; struct spa_param_info params[5]; - int valid:1; - int have_format:1; + unsigned int valid:1; + unsigned int have_format:1; struct buffer buffers[MAX_BUFFERS]; uint32_t n_buffers; diff --git a/spa/plugins/ffmpeg/ffmpeg-dec.c b/spa/plugins/ffmpeg/ffmpeg-dec.c index 2014ca607..72fcf87cb 100644 --- a/spa/plugins/ffmpeg/ffmpeg-dec.c +++ b/spa/plugins/ffmpeg/ffmpeg-dec.c @@ -58,7 +58,7 @@ struct port { struct spa_param_info params[8]; struct spa_video_info current_format; - int have_format:1; + unsigned int have_format:1; struct buffer buffers[MAX_BUFFERS]; uint32_t n_buffers; diff --git a/spa/plugins/ffmpeg/ffmpeg-enc.c b/spa/plugins/ffmpeg/ffmpeg-enc.c index 9a929ae9b..36f3ebeec 100644 --- a/spa/plugins/ffmpeg/ffmpeg-enc.c +++ b/spa/plugins/ffmpeg/ffmpeg-enc.c @@ -57,7 +57,7 @@ struct port { struct spa_param_info params[8]; struct spa_video_info current_format; - int have_format:1; + unsigned int have_format:1; struct buffer buffers[MAX_BUFFERS]; uint32_t n_buffers; diff --git a/src/modules/module-audio-dsp/floatmix.c b/src/modules/module-audio-dsp/floatmix.c index 15f58e31b..3b31c1e99 100644 --- a/src/modules/module-audio-dsp/floatmix.c +++ b/src/modules/module-audio-dsp/floatmix.c @@ -80,8 +80,8 @@ struct port { struct spa_port_info info; struct spa_param_info params[8]; - int valid:1; - int have_format:1; + unsigned int valid:1; + unsigned int have_format:1; struct buffer buffers[MAX_BUFFERS]; uint32_t n_buffers; diff --git a/src/modules/module-client-node/client-node.c b/src/modules/module-client-node/client-node.c index 8f9234741..aac084fc6 100644 --- a/src/modules/module-client-node/client-node.c +++ b/src/modules/module-client-node/client-node.c @@ -111,8 +111,8 @@ struct port { struct spa_port_info info; struct pw_properties *properties; - int have_format:1; - int removed:1; + unsigned int have_format:1; + unsigned int removed:1; uint32_t n_params; struct spa_pod **params; diff --git a/src/modules/module-client-node/client-stream.c b/src/modules/module-client-node/client-stream.c index 622dc204c..adeb3a80a 100644 --- a/src/modules/module-client-node/client-stream.c +++ b/src/modules/module-client-node/client-stream.c @@ -1262,6 +1262,7 @@ struct pw_client_stream *pw_client_stream_new(struct pw_resource *resource, struct pw_client *client = pw_resource_get_client(resource); struct pw_core *core = pw_client_get_core(client); const struct spa_support *support; + struct pw_properties *props; uint32_t n_support; const char *name; @@ -1275,10 +1276,13 @@ struct pw_client_stream *pw_client_stream_new(struct pw_resource *resource, pw_log_debug("client-stream %p: new", impl); + props = pw_properties_copy(properties); + pw_properties_set(props, "node.driver", NULL); + impl->client_node = pw_client_node_new( resource, parent, - pw_properties_copy(properties), + props, false); if (impl->client_node == NULL) goto error_no_node; diff --git a/src/modules/spa/spa-node.c b/src/modules/spa/spa-node.c index f0a0aba93..26a80b5ad 100644 --- a/src/modules/spa/spa-node.c +++ b/src/modules/spa/spa-node.c @@ -61,7 +61,7 @@ struct impl { void *user_data; - int async_init:1; + unsigned int async_init:1; }; static void spa_node_free(void *data) diff --git a/src/pipewire/node.c b/src/pipewire/node.c index 903484637..c8aa45646 100644 --- a/src/pipewire/node.c +++ b/src/pipewire/node.c @@ -52,7 +52,7 @@ struct impl { uint32_t next_position; int last_error; - int pause_on_idle:1; + unsigned int pause_on_idle:1; }; struct resource_data { @@ -607,6 +607,7 @@ static void check_properties(struct pw_node *node) driver = false; if (node->driver != driver) { + pw_log_info("node %p: driver %d -> %d", node, node->driver, driver); node->driver = driver; if (driver) spa_list_append(&node->core->driver_list, &node->core_driver_link); diff --git a/src/pipewire/private.h b/src/pipewire/private.h index 267233c3f..82599d3e1 100644 --- a/src/pipewire/private.h +++ b/src/pipewire/private.h @@ -125,9 +125,9 @@ struct pw_client { void *user_data; /**< extra user data */ struct ucred ucred; /**< ucred information */ - int registered:1; - int ucred_valid:1; /**< if the ucred member is valid */ - int busy:1; + unsigned int registered:1; + unsigned int ucred_valid:1; /**< if the ucred member is valid */ + unsigned int busy:1; }; #define pw_global_emit(o,m,v,...) spa_hook_list_call(&o->listener_list, struct pw_global_events, m, v, ##__VA_ARGS__) @@ -210,14 +210,14 @@ struct pw_core { #define pw_data_loop_emit_destroy(o) pw_data_loop_emit(o, destroy, 0) struct pw_data_loop { - struct pw_loop *loop; + struct pw_loop *loop; struct spa_hook_list listener_list; - struct spa_source *event; + struct spa_source *event; - pthread_t thread; - int running:1; + pthread_t thread; + unsigned int running:1; }; #define pw_main_loop_emit(o,m,v,...) spa_hook_list_call(&o->listener_list, struct pw_main_loop_events, m, v, ##__VA_ARGS__) @@ -227,9 +227,9 @@ struct pw_main_loop { struct pw_loop *loop; struct spa_hook_list listener_list; - struct spa_source *event; + struct spa_source *event; - int running:1; + unsigned int running:1; }; struct allocation { @@ -277,7 +277,7 @@ struct pw_device { void *user_data; /**< device user_data */ - int registered:1; + unsigned int registered:1; }; #define pw_module_emit(o,m,v,...) spa_hook_list_call(&o->listener_list, struct pw_module_events, m, v, ##__VA_ARGS__) @@ -365,16 +365,16 @@ struct pw_node { struct pw_node_info info; /**< introspectable node info */ struct spa_param_info params[MAX_PARAMS]; - int registered:1; - int enabled:1; /**< if the node is enabled */ - int active:1; /**< if the node is active */ - int live:1; /**< if the node is live */ - int driver:1; /**< if the node can drive the graph */ - int exported:1; /**< if the node is exported */ - int remote:1; /**< if the node is implemented remotely */ - int master:1; /**< a master node is one of the driver nodes that + unsigned int registered:1; + unsigned int enabled:1; /**< if the node is enabled */ + unsigned int active:1; /**< if the node is active */ + unsigned int live:1; /**< if the node is live */ + unsigned int driver:1; /**< if the node can drive the graph */ + unsigned int exported:1; /**< if the node is exported */ + unsigned int remote:1; /**< if the node is implemented remotely */ + unsigned int master:1; /**< a master node is one of the driver nodes that * is selected to drive the graph */ - int visited:1; /**< for sorting */ + unsigned int visited:1; /**< for sorting */ uint32_t port_user_data_size; /**< extra size for port user data */ @@ -503,7 +503,7 @@ struct pw_port { #define PW_PORT_MIX_FLAG_MIX_ONLY (1<<1) /**< only negotiate mix ports */ uint32_t mix_flags; /**< flags for the mixing */ - int allocated:1; /**< if buffers are allocated */ + unsigned int allocated:1; /**< if buffers are allocated */ struct spa_list mix_list; /**< list of \ref pw_port_mix */ struct pw_map mix_port_map; /**< map from port_id from mixer */ @@ -527,7 +527,7 @@ struct pw_control_link { struct pw_control *input; uint32_t out_port; uint32_t in_port; - int valid:1; + unsigned int valid:1; }; #define pw_link_emit(o,m,v,...) spa_hook_list_call(&o->listener_list, struct pw_link_events, m, v, ##__VA_ARGS__) @@ -566,8 +566,8 @@ struct pw_link { void *user_data; - int registered:1; - int feedback:1; + unsigned int registered:1; + unsigned int feedback:1; }; #define pw_resource_emit(o,m,v,...) spa_hook_list_call(&o->listener_list, struct pw_resource_events, m, v, ##__VA_ARGS__) @@ -607,7 +607,7 @@ struct pw_proxy { struct spa_list link; /**< link in the remote */ uint32_t id; /**< client side id */ - int removed:1; /**< proxy was removed from server */ + unsigned int removed:1; /**< proxy was removed from server */ struct spa_hook_list listener_list; struct spa_hook_list proxy_listener_list; @@ -702,7 +702,7 @@ struct pw_factory { void *user_data; - int registered:1; + unsigned int registered:1; }; #define pw_control_emit(c,m,v,...) spa_hook_list_call(&c->listener_list, struct pw_control_events, m, v, ##__VA_ARGS__) diff --git a/src/pipewire/stream.c b/src/pipewire/stream.c index deceb08b4..66b20af7f 100644 --- a/src/pipewire/stream.c +++ b/src/pipewire/stream.c @@ -84,14 +84,14 @@ struct control { struct spa_list link; struct pw_stream_control control; struct spa_pod *info; - int emitted:1; + unsigned int emitted:1; }; #define DEFAULT_VOLUME 1.0 struct props { float volume; - int changed:1; + unsigned int changed:1; }; static void reset_props(struct props *props) @@ -142,10 +142,10 @@ struct stream { uint32_t param_propinfo; - int async_connect:1; - int disconnecting:1; - int free_data:1; - int subscribe:1; + unsigned int async_connect:1; + unsigned int disconnecting:1; + unsigned int free_data:1; + unsigned int subscribe:1; }; static int get_param_index(uint32_t id) diff --git a/src/pipewire/thread-loop.c b/src/pipewire/thread-loop.c index 6d14283d9..bdcbecfe0 100644 --- a/src/pipewire/thread-loop.c +++ b/src/pipewire/thread-loop.c @@ -51,7 +51,7 @@ struct pw_thread_loop { int n_waiting; int n_waiting_for_accept; - int running:1; + unsigned int running:1; }; /** \endcond */