summaryrefslogtreecommitdiffstats
path: root/audio/out/ao_alsa.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-10-10 18:27:21 +0200
committerwm4 <wm4@nowhere>2014-10-10 18:27:21 +0200
commitedad4fc29b6da0202d6be4daf63dbcf825d85212 (patch)
tree421f4340787c72beeaa895f0afce3433daff3638 /audio/out/ao_alsa.c
parent19d21103e564d05d830aaa6d60a3a7fa1f122dca (diff)
downloadmpv-edad4fc29b6da0202d6be4daf63dbcf825d85212.tar.bz2
mpv-edad4fc29b6da0202d6be4daf63dbcf825d85212.tar.xz
audio: change internal device listing API
Now we run ao_driver->list_devs on a dummy AO instance, which will probably confuse everyone. This is done for the sake of PulseAudio.
Diffstat (limited to 'audio/out/ao_alsa.c')
-rw-r--r--audio/out/ao_alsa.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/audio/out/ao_alsa.c b/audio/out/ao_alsa.c
index 1b0703cea6..fb3cef75d4 100644
--- a/audio/out/ao_alsa.c
+++ b/audio/out/ao_alsa.c
@@ -733,7 +733,7 @@ alsa_error:
return -1;
}
-static void list_devs(const struct ao_driver *d, struct ao_device_list *list)
+static void list_devs(struct ao *ao, struct ao_device_list *list)
{
void **hints;
if (snd_device_name_hint(-1, "pcm", &hints) < 0)
@@ -751,7 +751,7 @@ static void list_devs(const struct ao_driver *d, struct ao_device_list *list)
if (desc2[i] == '\n')
desc2[i] = '/';
}
- ao_device_list_add(list, d, &(struct ao_device_desc){name, desc2});
+ ao_device_list_add(list, ao, &(struct ao_device_desc){name, desc2});
}
snd_device_name_free_hint(hints);