RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

audio/out: add "auto" pseudo-device 

Also, don't set an empty string for the fallback device if an AO doesn't
list any devices.
This commit is contained in:
wm4 2014-10-13 16:42:44 +02:00
parent 057384baa6
commit 2e52cc8f2e
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
audio/out/ao.c
View File

@ -402,6 +402,8 @@ bool ao_untimed(struct ao *ao)
struct ao_device_list *ao_get_device_list(struct mpv_global *global)
{
struct ao_device_list *list = talloc_zero(NULL, struct ao_device_list);
MP_TARRAY_APPEND(list, list->devices, list->num_devices,
(struct ao_device_desc){"auto", "Autoselect device"});
for (int n = 0; audio_out_drivers[n]; n++) {
const struct ao_driver *d = audio_out_drivers[n];
if (d->encode)
@ -414,7 +416,7 @@ struct ao_device_list *ao_get_device_list(struct mpv_global *global)
d->list_devs(ao, list);
// Add at least a default entry
if (list->num_devices == num)
ao_device_list_add(list, ao, &(struct ao_device_desc){"", ""});
ao_device_list_add(list, ao, &(struct ao_device_desc){"", "Default"});
talloc_free(ao);
}
return list;