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

ao_alsa: filter audio device list 

Remove known useless device entries from the --audio-device list (and
corresponding property). Do this because the list is supposed to be a
high level list of devices the user can select. ALSA does not provide
such a list (in an useable manner), and ao_alsa.c is still in the best
position to improve the situation somewhat.
This commit is contained in:
wm4 2015-11-24 19:47:58 +01:00
parent ef918b239e
commit 06df54a111
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
audio/out/ao_alsa.c
View File

@ -977,6 +977,20 @@ alsa_error:
return -1; return -1;
} }
static bool is_useless_device(char *name)
{
char *crap[] = {"front", "rear", "center_lfe", "side", "surround21",
"surround40", "surround41", "surround50", "surround51", "surround71",
"sysdefault", "pulse", "null", "dsnoop", "dmix", "hw", "iec958"};
for (int i = 0; i < MP_ARRAY_SIZE(crap); i++) {
int l = strlen(crap[i]);
if (name && strncmp(name, crap[i], l) == 0 &&
(!name[l] || name[l] == ':'))
return true;
}
return false;
}
static void list_devs(struct ao *ao, struct ao_device_list *list) static void list_devs(struct ao *ao, struct ao_device_list *list)
{ {
void **hints; void **hints;
@ -987,7 +1001,7 @@ static void list_devs(struct ao *ao, struct ao_device_list *list)
char *name = snd_device_name_get_hint(hints[n], "NAME"); char *name = snd_device_name_get_hint(hints[n], "NAME");
char *desc = snd_device_name_get_hint(hints[n], "DESC"); char *desc = snd_device_name_get_hint(hints[n], "DESC");
char *io = snd_device_name_get_hint(hints[n], "IOID"); char *io = snd_device_name_get_hint(hints[n], "IOID");
if (!io || strcmp(io, "Output") == 0) { if (!is_useless_device(name) && (!io || strcmp(io, "Output") == 0)) {
char desc2[1024]; char desc2[1024];
snprintf(desc2, sizeof(desc2), "%s", desc ? desc : ""); snprintf(desc2, sizeof(desc2), "%s", desc ? desc : "");
for (int i = 0; desc2[i]; i++) { for (int i = 0; desc2[i]; i++) {