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

jack: update for API changes

Browse source
This commit is contained in:
Wim Taymans 2018-08-27 09:06:17 +02:00
parent e341b2792d
commit 7e3df7dc60
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/pipewire-jack.c
View file

@ -789,7 +789,7 @@ static void client_node_set_io(void *object,
pw_log_debug("client %p: set io %s %p", c, pw_log_debug("client %p: set io %s %p", c,
spa_debug_type_find_name(spa_debug_types, id), ptr); spa_debug_type_find_name(spa_debug_types, id), ptr);
if (id == PW_ID_IO_ClientNodePosition) { if (id == PW_IO_ClientNodePosition) {
if (ptr == NULL && c->position) { if (ptr == NULL && c->position) {
m = find_mem_ptr(&c->mems, c->position); m = find_mem_ptr(&c->mems, c->position);
if (m && --m->ref == 0) if (m && --m->ref == 0)
@ -902,18 +902,18 @@ static int param_enum_format(struct client *c, struct port *p,
switch (p->object->port.type_id) { switch (p->object->port.type_id) {
case 0: case 0:
*param = spa_pod_builder_object(b, *param = spa_pod_builder_object(b,
SPA_ID_PARAM_EnumFormat, SPA_ID_OBJECT_Format, SPA_PARAM_EnumFormat, SPA_ID_OBJECT_Format,
"I", SPA_MEDIA_TYPE_audio, "I", SPA_MEDIA_TYPE_audio,
"I", SPA_MEDIA_SUBTYPE_raw, "I", SPA_MEDIA_SUBTYPE_raw,
":", SPA_FORMAT_AUDIO_format, "I", SPA_AUDIO_FORMAT_F32, ":", SPA_FORMAT_AUDIO_format, "I", SPA_AUDIO_FORMAT_F32,
":", SPA_FORMAT_AUDIO_layout, "i", SPA_AUDIO_LAYOUT_NON_INTERLEAVED, ":", SPA_FORMAT_AUDIO_layout, "I", SPA_AUDIO_LAYOUT_NON_INTERLEAVED,
":", SPA_FORMAT_AUDIO_rate, "iru", DEFAULT_SAMPLE_RATE, ":", SPA_FORMAT_AUDIO_rate, "iru", DEFAULT_SAMPLE_RATE,
SPA_POD_PROP_MIN_MAX(1, INT32_MAX), SPA_POD_PROP_MIN_MAX(1, INT32_MAX),
":", SPA_FORMAT_AUDIO_channels, "i", 1); ":", SPA_FORMAT_AUDIO_channels, "i", 1);
break; break;
case 1: case 1:
*param = spa_pod_builder_object(b, *param = spa_pod_builder_object(b,
SPA_ID_PARAM_EnumFormat, SPA_ID_OBJECT_Format, SPA_PARAM_EnumFormat, SPA_ID_OBJECT_Format,
"I", SPA_MEDIA_TYPE_stream, "I", SPA_MEDIA_TYPE_stream,
"I", SPA_MEDIA_SUBTYPE_midi); "I", SPA_MEDIA_SUBTYPE_midi);
break; break;
@ -930,11 +930,11 @@ static int param_format(struct client *c, struct port *p,
case 0: case 0:
*param = spa_pod_builder_object(b, *param = spa_pod_builder_object(b,
SPA_ID_PARAM_Format, SPA_ID_OBJECT_Format, SPA_PARAM_Format, SPA_ID_OBJECT_Format,
"I", SPA_MEDIA_TYPE_audio, "I", SPA_MEDIA_TYPE_audio,
"I", SPA_MEDIA_SUBTYPE_raw, "I", SPA_MEDIA_SUBTYPE_raw,
":", SPA_FORMAT_AUDIO_format, "I", SPA_AUDIO_FORMAT_F32, ":", SPA_FORMAT_AUDIO_format, "I", SPA_AUDIO_FORMAT_F32,
":", SPA_FORMAT_AUDIO_layout, "i", SPA_AUDIO_LAYOUT_NON_INTERLEAVED, ":", SPA_FORMAT_AUDIO_layout, "I", SPA_AUDIO_LAYOUT_NON_INTERLEAVED,
":", SPA_FORMAT_AUDIO_rate, p->have_format ? "iru" : "ir", ":", SPA_FORMAT_AUDIO_rate, p->have_format ? "iru" : "ir",
p->have_format ? p->rate : DEFAULT_SAMPLE_RATE, p->have_format ? p->rate : DEFAULT_SAMPLE_RATE,
SPA_POD_PROP_MIN_MAX(1, INT32_MAX), SPA_POD_PROP_MIN_MAX(1, INT32_MAX),
@ -942,7 +942,7 @@ static int param_format(struct client *c, struct port *p,
break; break;
case 1: case 1:
*param = spa_pod_builder_object(b, *param = spa_pod_builder_object(b,
SPA_ID_PARAM_Format, SPA_ID_OBJECT_Format, SPA_PARAM_Format, SPA_ID_OBJECT_Format,
"I", SPA_MEDIA_TYPE_stream, "I", SPA_MEDIA_TYPE_stream,
"I", SPA_MEDIA_SUBTYPE_midi); "I", SPA_MEDIA_SUBTYPE_midi);
break; break;
@ -956,7 +956,7 @@ static int param_buffers(struct client *c, struct port *p,
struct spa_pod **param, struct spa_pod_builder *b) struct spa_pod **param, struct spa_pod_builder *b)
{ {
*param = spa_pod_builder_object(b, *param = spa_pod_builder_object(b,
SPA_ID_PARAM_Buffers, SPA_ID_OBJECT_ParamBuffers, SPA_PARAM_Buffers, SPA_ID_OBJECT_ParamBuffers,
":", SPA_PARAM_BUFFERS_buffers, "iru", 1, ":", SPA_PARAM_BUFFERS_buffers, "iru", 1,
SPA_POD_PROP_MIN_MAX(1, MAX_BUFFERS), SPA_POD_PROP_MIN_MAX(1, MAX_BUFFERS),
":", SPA_PARAM_BUFFERS_blocks, "i", 1, ":", SPA_PARAM_BUFFERS_blocks, "i", 1,
@ -1020,7 +1020,7 @@ static void client_node_port_set_param(void *object,
uint8_t buffer[4096]; uint8_t buffer[4096];
struct spa_pod_builder b = SPA_POD_BUILDER_INIT(buffer, sizeof(buffer)); struct spa_pod_builder b = SPA_POD_BUILDER_INIT(buffer, sizeof(buffer));
if (id == SPA_ID_PARAM_Format) { if (id == SPA_PARAM_Format) {
port_set_format(c, p, flags, param); port_set_format(c, p, flags, param);
} }
@ -1266,7 +1266,7 @@ static void client_node_port_set_io(void *object,
update_io(c, mix, id, mem_id); update_io(c, mix, id, mem_id);
if (id == SPA_ID_IO_Buffers) if (id == SPA_IO_Buffers)
mix->io = ptr; mix->io = ptr;
pw_log_debug("port %p: set io id %u %u %u %u %p", p, id, mem_id, offset, size, ptr); pw_log_debug("port %p: set io id %u %u %u %u %p", p, id, mem_id, offset, size, ptr);