From edad4fc29b6da0202d6be4daf63dbcf825d85212 Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 10 Oct 2014 18:27:21 +0200 Subject: 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. --- audio/out/ao.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'audio/out/ao.h') diff --git a/audio/out/ao.h b/audio/out/ao.h index 32b6611afc..3d811fe8d3 100644 --- a/audio/out/ao.h +++ b/audio/out/ao.h @@ -52,8 +52,8 @@ typedef struct ao_control_vol { } ao_control_vol_t; struct ao_device_desc { - char *name; // symbolic name; will be set on ao->device - char *desc; // verbose human readable name + const char *name; // symbolic name; will be set on ao->device + const char *desc; // verbose human readable name }; struct ao_device_list { @@ -86,7 +86,7 @@ void ao_resume(struct ao *ao); void ao_drain(struct ao *ao); bool ao_eof_reached(struct ao *ao); -struct ao_device_list *ao_get_device_list(void); -void ao_print_devices(struct mp_log *log); +struct ao_device_list *ao_get_device_list(struct mpv_global *global); +void ao_print_devices(struct mpv_global *global, struct mp_log *log); #endif /* MPLAYER_AUDIO_OUT_H */ -- cgit v1.2.3