mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-29 05:40:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

acp: add channel to string function

Browse source 
Add a function to convert the channel to a string and use that
instead of the unsafe one.

Fixes #519
This commit is contained in:
Wim Taymans 2020-12-28 13:27:34 +01:00
parent 509152108a
commit c84646b66f
3 changed files with 62 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
spa/plugins/alsa/alsa-acp-device.c
View file

@ -142,9 +142,9 @@ static int emit_node(struct impl *this, struct acp_device *dev)
struct spa_dict_item *items;
const struct acp_dict_item *it;
uint32_t n_items, i;
char device_name[128], path[180], channels[16];
char device_name[128], path[180], channels[16], ch[12];
char card_id[16], *p;
char positions[SPA_AUDIO_MAX_CHANNELS * 6];
char positions[SPA_AUDIO_MAX_CHANNELS * 12];
struct spa_device_object_info info;
struct acp_card *card = this->card;
const char *stream, *devstr;;
@ -186,9 +186,10 @@ static int emit_node(struct impl *this, struct acp_device *dev)
items[4] = SPA_DICT_ITEM_INIT(SPA_KEY_AUDIO_CHANNELS, channels);
p = positions;
for (i = 0; i < dev->format.channels; i++)
p += snprintf(p, 6, "%s%s", i == 0 ? "" : ",",
spa_debug_type_short_name(spa_type_audio_channel[dev->format.map[i]].name));
for (i = 0; i < dev->format.channels; i++) {
p += snprintf(p, 12, "%s%s", i == 0 ? "" : ",",
acp_channel_str(ch, sizeof(ch), dev->format.map[i]));
}
items[5] = SPA_DICT_ITEM_INIT(SPA_KEY_AUDIO_POSITION, positions);
n_items = 6;