mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-04 13:30:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

pulse-server: map some properties

Browse source 
Fixes the icon names.

See #377
This commit is contained in:
Wim Taymans 2020-11-16 11:29:07 +01:00
parent 78ab2c3cad
commit 1d3e6b6772
1 changed files with 37 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/modules/module-protocol-pulse/message.c
View file

@ -43,6 +43,41 @@ static inline float volume_to_linear(uint32_t vol)
return v * v * v; return v * v * v;
} }
struct key_map {
const char *pw_key;
const char *pa_key;
};
const struct key_map key_table[] = {
{ PW_KEY_DEVICE_BUS_PATH, "device.bus_path" },
{ PW_KEY_DEVICE_FORM_FACTOR, "device.form_factor" },
{ PW_KEY_DEVICE_ICON_NAME, "device.icon_name" },
{ PW_KEY_DEVICE_INTENDED_ROLES, "device.intended_roles" },
{ PW_KEY_MEDIA_ICON_NAME, "media.icon_name" },
{ PW_KEY_APP_ICON_NAME, "application.icon_name" },
{ PW_KEY_APP_PROCESS_MACHINE_ID, "application.process.machine_id" },
{ PW_KEY_APP_PROCESS_SESSION_ID, "application.process.session_id" },
};
static inline const char *pa_key_to_pw(const char *key)
{
uint32_t i;
for (i = 0; i < SPA_N_ELEMENTS(key_table); i++)
if (strcmp(key_table[i].pa_key, key) == 0)
return key_table[i].pw_key;
return key;
}
static inline const char *pw_key_to_pa(const char *key)
{
uint32_t i;
for (i = 0; i < SPA_N_ELEMENTS(key_table); i++)
if (strcmp(key_table[i].pw_key, key) == 0)
return key_table[i].pa_key;
return key;
}
struct descriptor { struct descriptor {
uint32_t length; uint32_t length;
uint32_t channel; uint32_t channel;
@ -157,7 +192,7 @@ static int read_props(struct message *m, struct pw_properties *props)
TAG_INVALID)) < 0) TAG_INVALID)) < 0)
return res; return res;
pw_properties_set(props, key, data); pw_properties_set(props, pa_key_to_pw(key), data);
} }
return 0; return 0;
} }
@ -505,7 +540,7 @@ static void write_dict(struct message *m, struct spa_dict *dict)
if (dict != NULL) { if (dict != NULL) {
spa_dict_for_each(it, dict) { spa_dict_for_each(it, dict) {
int l = strlen(it->value); int l = strlen(it->value);
write_string(m, it->key); write_string(m, pw_key_to_pa(it->key));
write_u32(m, l+1); write_u32(m, l+1);
write_arbitrary(m, it->value, l+1); write_arbitrary(m, it->value, l+1);
} }