RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-09 16:39:49 +00:00
Code Issues Releases Wiki Activity

Revert "ao_pipewire: handle AOCONTROL_UPDATE_MEDIA_ROLE"

Browse Source 
As the role property is interpreted by wireplumber it can only be
evaluated when creating the stream. The current, dynamic mechanism is
racy so revert it.

See: #11253
Fixes: #12041
This reverts commit 535cd6f313.
This commit is contained in:
Thomas Weißschuh 2023-07-30 10:18:57 +02:00 committed by sfan5
parent 3bdf702b1d
commit 0fb7ab62c5
1 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
audio/out/ao_pipewire.c
View File

@ -553,6 +553,7 @@ static int init(struct ao *ao)
struct pw_properties *props = pw_properties_new( struct pw_properties *props = pw_properties_new(
PW_KEY_MEDIA_TYPE, "Audio", PW_KEY_MEDIA_TYPE, "Audio",
PW_KEY_MEDIA_CATEGORY, "Playback", PW_KEY_MEDIA_CATEGORY, "Playback",
PW_KEY_MEDIA_ROLE, "Movie",
PW_KEY_NODE_NAME, ao->client_name, PW_KEY_NODE_NAME, ao->client_name,
PW_KEY_NODE_DESCRIPTION, ao->client_name, PW_KEY_NODE_DESCRIPTION, ao->client_name,
PW_KEY_APP_NAME, ao->client_name, PW_KEY_APP_NAME, ao->client_name,
@ -677,8 +678,7 @@ static int control(struct ao *ao, enum aocontrol cmd, void *arg)
} }
case AOCONTROL_SET_VOLUME: case AOCONTROL_SET_VOLUME:
case AOCONTROL_SET_MUTE: case AOCONTROL_SET_MUTE:
case AOCONTROL_UPDATE_STREAM_TITLE: case AOCONTROL_UPDATE_STREAM_TITLE: {
case AOCONTROL_UPDATE_MEDIA_ROLE: {
int ret; int ret;
pw_thread_loop_lock(p->loop); pw_thread_loop_lock(p->loop);
@ -712,26 +712,6 @@ static int control(struct ao *ao, enum aocontrol cmd, void *arg)
ret = CONTROL_RET(pw_stream_update_properties(p->stream, &SPA_DICT_INIT(items, MP_ARRAY_SIZE(items)))); ret = CONTROL_RET(pw_stream_update_properties(p->stream, &SPA_DICT_INIT(items, MP_ARRAY_SIZE(items))));
break; break;
} }
case AOCONTROL_UPDATE_MEDIA_ROLE: {
enum aocontrol_media_role *role = arg;
struct spa_dict_item items[1];
const char *role_str;
switch (*role) {
case AOCONTROL_MEDIA_ROLE_MOVIE:
role_str = "Movie";
break;
case AOCONTROL_MEDIA_ROLE_MUSIC:
role_str = "Music";
break;
default:
MP_WARN(ao, "Unknown media role %d\n", *role);
role_str = "";
break;
}
items[0] = SPA_DICT_ITEM_INIT(PW_KEY_MEDIA_ROLE, role_str);
ret = CONTROL_RET(pw_stream_update_properties(p->stream, &SPA_DICT_INIT(items, MP_ARRAY_SIZE(items))));
break;
}
default: default:
ret = CONTROL_NA; ret = CONTROL_NA;
} }