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

update for format change

Browse source
This commit is contained in:
Wim Taymans 2018-09-01 14:12:24 +02:00
parent 19336672a9
commit fd97452654
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/pipewire-jack.c
View file

@ -787,7 +787,7 @@ static void client_node_set_io(void *object,
m->ref++; m->ref++;
} }
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_type_io, id), ptr);
if (id == PW_IO_ClientNodePosition) { if (id == PW_IO_ClientNodePosition) {
if (ptr == NULL && c->position) { if (ptr == NULL && c->position) {
@ -903,8 +903,8 @@ static int param_enum_format(struct client *c, struct port *p,
case 0: case 0:
*param = spa_pod_builder_object(b, *param = spa_pod_builder_object(b,
SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat, SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat,
"I", SPA_MEDIA_TYPE_audio, ":", SPA_FORMAT_mediaType, "I", SPA_MEDIA_TYPE_audio,
"I", SPA_MEDIA_SUBTYPE_raw, ":", SPA_FORMAT_mediaSubtype, "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,
@ -914,8 +914,8 @@ static int param_enum_format(struct client *c, struct port *p,
case 1: case 1:
*param = spa_pod_builder_object(b, *param = spa_pod_builder_object(b,
SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat, SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat,
"I", SPA_MEDIA_TYPE_stream, ":", SPA_FORMAT_mediaType, "I", SPA_MEDIA_TYPE_stream,
"I", SPA_MEDIA_SUBTYPE_midi); ":", SPA_FORMAT_mediaSubtype, "I", SPA_MEDIA_SUBTYPE_midi);
break; break;
default: default:
return -EINVAL; return -EINVAL;
@ -931,8 +931,8 @@ static int param_format(struct client *c, struct port *p,
*param = spa_pod_builder_object(b, *param = spa_pod_builder_object(b,
SPA_TYPE_OBJECT_Format, SPA_PARAM_Format, SPA_TYPE_OBJECT_Format, SPA_PARAM_Format,
"I", SPA_MEDIA_TYPE_audio, ":", SPA_FORMAT_mediaType, "I", SPA_MEDIA_TYPE_audio,
"I", SPA_MEDIA_SUBTYPE_raw, ":", SPA_FORMAT_mediaSubtype, "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",
@ -943,8 +943,8 @@ static int param_format(struct client *c, struct port *p,
case 1: case 1:
*param = spa_pod_builder_object(b, *param = spa_pod_builder_object(b,
SPA_TYPE_OBJECT_Format, SPA_PARAM_Format, SPA_TYPE_OBJECT_Format, SPA_PARAM_Format,
"I", SPA_MEDIA_TYPE_stream, ":", SPA_FORMAT_mediaType, "I", SPA_MEDIA_TYPE_stream,
"I", SPA_MEDIA_SUBTYPE_midi); ":", SPA_FORMAT_mediaSubtype, "I", SPA_MEDIA_SUBTYPE_midi);
break; break;
default: default:
return -EINVAL; return -EINVAL;