builder: control_header -> control

This commit is contained in:
Wim Taymans 2019-01-17 17:11:58 +01:00
parent 3ee463ed3a
commit 5376832676
7 changed files with 9 additions and 9 deletions

@ -1 +1 @@
Subproject commit c1da362a24351c8827d5b964d24ef5176e87ca95
Subproject commit 4bdaa083d13771e37d7d2c1e20953c7b617dfa2b

View file

@ -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),

View file

@ -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:

View file

@ -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);

View file

@ -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);

View file

@ -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);

View file

@ -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);