diff options
| author | Thomas Weißschuh <thomas@t-8ch.de> | 2023-07-30 10:18:57 +0200 |
|---|---|---|
| committer | sfan5 <sfan5@live.de> | 2023-07-30 19:48:35 +0200 |
| commit | 0fb7ab62c545032499042dceaacda6741718dd65 (patch) | |
| tree | 689c759f33e04816fb653f19338a99503286b2fa /audio/out | |
| parent | 3bdf702b1de8b0d0e0fb700b234b0fc69e04a630 (diff) | |
| download | mpv-0fb7ab62c545032499042dceaacda6741718dd65.tar.bz2 mpv-0fb7ab62c545032499042dceaacda6741718dd65.tar.xz | |
Revert "ao_pipewire: handle AOCONTROL_UPDATE_MEDIA_ROLE"
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 535cd6f3130a179890505535b1cb06998a9cb07f.
Diffstat (limited to 'audio/out')
| -rw-r--r-- | audio/out/ao_pipewire.c | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/audio/out/ao_pipewire.c b/audio/out/ao_pipewire.c index 0a39e4e1a5..95624ab32a 100644 --- a/audio/out/ao_pipewire.c +++ b/audio/out/ao_pipewire.c @@ -553,6 +553,7 @@ static int init(struct ao *ao) struct pw_properties *props = pw_properties_new( PW_KEY_MEDIA_TYPE, "Audio", PW_KEY_MEDIA_CATEGORY, "Playback", + PW_KEY_MEDIA_ROLE, "Movie", PW_KEY_NODE_NAME, ao->client_name, PW_KEY_NODE_DESCRIPTION, 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_MUTE: - case AOCONTROL_UPDATE_STREAM_TITLE: - case AOCONTROL_UPDATE_MEDIA_ROLE: { + case AOCONTROL_UPDATE_STREAM_TITLE: { int ret; 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)))); 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: ret = CONTROL_NA; } |