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

alsa: update for api changes

Browse source
This commit is contained in:
Wim Taymans 2018-09-05 16:48:43 +02:00
parent 3f73c9355c
commit 4acfb88cb7
1 changed files with 7 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

23
alsa-plugins/pcm_pipewire.c
View file

@ -323,13 +323,12 @@ static void on_stream_format_changed(void *data, const struct spa_pod *format)
params[n_params++] = spa_pod_builder_object(&b, params[n_params++] = spa_pod_builder_object(&b,
SPA_TYPE_OBJECT_ParamBuffers, SPA_PARAM_Buffers, SPA_TYPE_OBJECT_ParamBuffers, SPA_PARAM_Buffers,
":", SPA_PARAM_BUFFERS_buffers, "iru", buffers, SPA_PARAM_BUFFERS_buffers, &SPA_POD_CHOICE_RANGE_Int(buffers, MIN_BUFFERS, MAX_BUFFERS),
SPA_POD_PROP_MIN_MAX(MIN_BUFFERS, MAX_BUFFERS), SPA_PARAM_BUFFERS_blocks, &SPA_POD_Int(1),
":", SPA_PARAM_BUFFERS_blocks, "i", 1, SPA_PARAM_BUFFERS_size, &SPA_POD_CHOICE_RANGE_Int(size, size, INT_MAX),
":", SPA_PARAM_BUFFERS_size, "ir", size, SPA_PARAM_BUFFERS_stride, &SPA_POD_Int(stride),
SPA_POD_PROP_MIN_MAX(size, INT_MAX), SPA_PARAM_BUFFERS_align, &SPA_POD_Int(16),
":", SPA_PARAM_BUFFERS_stride, "i", stride, 0);
":", SPA_PARAM_BUFFERS_align, "i", 16);
pw_stream_finish_format(pw->stream, 0, params, n_params); pw_stream_finish_format(pw->stream, 0, params, n_params);
} }
@ -393,15 +392,7 @@ static int snd_pcm_pipewire_prepare(snd_pcm_ioplug_t *io)
pw_stream_add_listener(pw->stream, &pw->stream_listener, &stream_events, pw); pw_stream_add_listener(pw->stream, &pw->stream_listener, &stream_events, pw);
params[0] = spa_pod_builder_object(&b, params[0] = spa_format_audio_raw_build(&b, SPA_PARAM_EnumFormat, &pw->format);
SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat,
"I", SPA_MEDIA_TYPE_audio,
"I", SPA_MEDIA_SUBTYPE_raw,
":", SPA_FORMAT_AUDIO_format, "I", pw->format.format,
":", SPA_FORMAT_AUDIO_layout, "I", pw->format.layout,
":", SPA_FORMAT_AUDIO_channels, "i", pw->format.channels,
":", SPA_FORMAT_AUDIO_rate, "i", pw->format.rate);
pw->error = false; pw->error = false;
pw_stream_connect(pw->stream, pw_stream_connect(pw->stream,