diff options
| author | Martin Herkt <lachs0r@srsfckn.biz> | 2016-07-10 01:06:17 +0200 |
|---|---|---|
| committer | Martin Herkt <lachs0r@srsfckn.biz> | 2016-07-10 01:06:17 +0200 |
| commit | 76354385929b76b02b8c32a7b1cd4d669a8f2e0a (patch) | |
| tree | 738a432ac5648098cf93101bf64a010cff47486a /audio/out/ao_oss.c | |
| parent | 69e7b0d3ea4b75a8040ede5b9b7e6fa93ec68056 (diff) | |
| parent | e518bf2c72fc862fbe1de1c98313a03fa0db2e98 (diff) | |
| download | mpv-76354385929b76b02b8c32a7b1cd4d669a8f2e0a.tar.bz2 mpv-76354385929b76b02b8c32a7b1cd4d669a8f2e0a.tar.xz | |
Merge branch 'master' into release/current
Diffstat (limited to 'audio/out/ao_oss.c')
| -rw-r--r-- | audio/out/ao_oss.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/audio/out/ao_oss.c b/audio/out/ao_oss.c index 3216d673e1..90d3b3e5c5 100644 --- a/audio/out/ao_oss.c +++ b/audio/out/ao_oss.c @@ -612,6 +612,12 @@ static int audio_wait(struct ao *ao, pthread_mutex_t *lock) return r; } +static void list_devs(struct ao *ao, struct ao_device_list *list) +{ + if (stat(PATH_DEV_DSP, &(struct stat){0}) == 0) + ao_device_list_add(list, ao, &(struct ao_device_desc){"", "Default"}); +} + #define OPT_BASE_STRUCT struct priv const struct ao_driver audio_out_oss = { @@ -629,6 +635,7 @@ const struct ao_driver audio_out_oss = { .drain = drain, .wait = audio_wait, .wakeup = ao_wakeup_poll, + .list_devs = list_devs, .priv_size = sizeof(struct priv), .priv_defaults = &(const struct priv) { .audio_fd = -1, |