summaryrefslogtreecommitdiffstats
path: root/audio/out/ao.h
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.h
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.h')
-rw-r--r--audio/out/ao.h8
1 files changed, 4 insertions, 4 deletions
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 */