From 5376832676feba2de688d8bffa915fffd08f6010 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Thu, 17 Jan 2019 17:11:58 +0100 Subject: [PATCH] builder: control_header -> control --- pipewire-jack | 2 +- spa/examples/example-control.c | 4 ++-- spa/include/spa/pod/builder.h | 4 ++-- spa/plugins/alsa/alsa-utils.c | 2 +- src/examples/export-sink.c | 2 +- src/examples/export-source.c | 2 +- src/pipewire/stream.c | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pipewire-jack b/pipewire-jack index c1da362a2..4bdaa083d 160000 --- a/pipewire-jack +++ b/pipewire-jack @@ -1 +1 @@ -Subproject commit c1da362a24351c8827d5b964d24ef5176e87ca95 +Subproject commit 4bdaa083d13771e37d7d2c1e20953c7b617dfa2b diff --git a/spa/examples/example-control.c b/spa/examples/example-control.c index c6f96254f..84db5ec34 100644 --- a/spa/examples/example-control.c +++ b/spa/examples/example-control.c @@ -203,7 +203,7 @@ static void update_props(struct data *data) #if 0 spa_pod_builder_push_sequence(&b, 0); - spa_pod_builder_control_header(&b, 0, SPA_CONTROL_Properties); + spa_pod_builder_control(&b, 0, SPA_CONTROL_Properties); spa_pod_builder_push_object(&b, SPA_TYPE_OBJECT_Props, 0); spa_pod_builder_prop(&b, SPA_PROP_frequency, 0); spa_pod_builder_float(&b, ((sin(data->freq_accum) + 1.0) * 200.0) + 440.0); @@ -213,7 +213,7 @@ static void update_props(struct data *data) pod = spa_pod_builder_pop(&b); #else spa_pod_builder_push_sequence(&b, 0); - spa_pod_builder_control_header(&b, 0, SPA_CONTROL_Properties); + spa_pod_builder_control(&b, 0, SPA_CONTROL_Properties); spa_pod_builder_add_object(&b, SPA_TYPE_OBJECT_Props, 0, SPA_PROP_frequency, SPA_POD_Float(((sin(data->freq_accum) + 1.0) * 200.0) + 440.0), diff --git a/spa/include/spa/pod/builder.h b/spa/include/spa/pod/builder.h index 88e28a53b..22732388f 100644 --- a/spa/include/spa/pod/builder.h +++ b/spa/include/spa/pod/builder.h @@ -449,7 +449,7 @@ spa_pod_builder_push_sequence(struct spa_pod_builder *builder, uint32_t unit) } static inline uint32_t -spa_pod_builder_control_header(struct spa_pod_builder *builder, uint32_t offset, uint32_t type) +spa_pod_builder_control(struct spa_pod_builder *builder, uint32_t offset, uint32_t type) { const struct { uint32_t offset; uint32_t type; } p = { offset, type }; uint32_t ref = spa_pod_builder_raw(builder, &p, sizeof(p)); @@ -591,7 +591,7 @@ spa_pod_builder_addv(struct spa_pod_builder *builder, va_list args) if (type == 0) break; if (type != SPA_ID_INVALID) - spa_pod_builder_control_header(builder, offset, type); + spa_pod_builder_control(builder, offset, type); } again: diff --git a/spa/plugins/alsa/alsa-utils.c b/spa/plugins/alsa/alsa-utils.c index f198a1dde..d03a5d794 100644 --- a/spa/plugins/alsa/alsa-utils.c +++ b/spa/plugins/alsa/alsa-utils.c @@ -616,7 +616,7 @@ static int update_time(struct state *state, uint64_t nsec, snd_pcm_sframes_t del struct spa_pod_builder b = { 0 }; spa_pod_builder_init(&b, state->notify, 1024); spa_pod_builder_push_sequence(&b, 0); - spa_pod_builder_control_header(&b, 0, SPA_CONTROL_Properties); + spa_pod_builder_control(&b, 0, SPA_CONTROL_Properties); spa_pod_builder_push_object(&b, SPA_TYPE_OBJECT_Props, SPA_PARAM_Props); spa_pod_builder_prop(&b, SPA_PROP_rate, 0); spa_pod_builder_double(&b, state->old_dt); diff --git a/src/examples/export-sink.c b/src/examples/export-sink.c index f29a1a182..9a416d141 100644 --- a/src/examples/export-sink.c +++ b/src/examples/export-sink.c @@ -116,7 +116,7 @@ static void update_param(struct data *data) spa_pod_builder_init(&b, data->io_notify, data->io_notify_size); spa_pod_builder_push_sequence(&b, 0); - spa_pod_builder_control_header(&b, 0, SPA_CONTROL_Properties); + spa_pod_builder_control(&b, 0, SPA_CONTROL_Properties); spa_pod_builder_push_object(&b, SPA_TYPE_OBJECT_Props, 0); spa_pod_builder_prop(&b, SPA_PROP_contrast, 0); spa_pod_builder_float(&b, (sin(data->param_accum) * 127.0) + 127.0); diff --git a/src/examples/export-source.c b/src/examples/export-source.c index f151ae685..a94496cea 100644 --- a/src/examples/export-source.c +++ b/src/examples/export-source.c @@ -87,7 +87,7 @@ static void update_volume(struct data *data) spa_pod_builder_init(&b, data->io_notify, data->io_notify_size); spa_pod_builder_push_sequence(&b, 0); - spa_pod_builder_control_header(&b, 0, SPA_CONTROL_Properties); + spa_pod_builder_control(&b, 0, SPA_CONTROL_Properties); spa_pod_builder_push_object(&b, SPA_TYPE_OBJECT_Props, 0); spa_pod_builder_prop(&b, SPA_PROP_volume, 0); spa_pod_builder_float(&b, (sin(data->volume_accum) / 2.0) + 0.5); diff --git a/src/pipewire/stream.c b/src/pipewire/stream.c index 00a2284c7..5ce3d5db9 100644 --- a/src/pipewire/stream.c +++ b/src/pipewire/stream.c @@ -652,7 +652,7 @@ static int process_notify(struct stream *impl, struct spa_pod_sequence *sequence spa_pod_builder_init(&b, impl->io_notify, impl->io_notify_size); spa_pod_builder_push_sequence(&b, 0); if ((changed = impl->props.changed)) { - spa_pod_builder_control_header(&b, 0, SPA_CONTROL_Properties); + spa_pod_builder_control(&b, 0, SPA_CONTROL_Properties); spa_pod_builder_push_object(&b, SPA_TYPE_OBJECT_Props, SPA_PARAM_Props); spa_pod_builder_prop(&b, SPA_PROP_volume, 0); spa_pod_builder_float(&b, impl->props.volume);