summaryrefslogtreecommitdiffstats
path: root/options
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-09-02 20:07:25 +0200
committerwm4 <wm4@nowhere>2016-09-02 21:21:47 +0200
commita85eecfe401ccaaa0b1981de71152bdc02184c66 (patch)
treee9e302e5a64438938c039fd4388f2aa68f82d1e0 /options
parenteb14b18a33973021c30124775513795b689cec27 (diff)
downloadmpv-a85eecfe401ccaaa0b1981de71152bdc02184c66.tar.bz2
mpv-a85eecfe401ccaaa0b1981de71152bdc02184c66.tar.xz
ao_alsa: change sub-options to global options
Same deal as with vo_opengl. Also edit the outdated information about multichannel output a little.
Diffstat (limited to 'options')
-rw-r--r--options/options.c4
-rw-r--r--options/options.h1
2 files changed, 5 insertions, 0 deletions
diff --git a/options/options.c b/options/options.c
index 1d840fd744..ddebceef36 100644
--- a/options/options.c
+++ b/options/options.c
@@ -75,6 +75,7 @@ extern const struct m_sub_options encode_config;
extern const struct m_sub_options image_writer_conf;
extern const struct m_sub_options gl_video_conf;
extern const struct m_sub_options vo_opengl_conf;
+extern const struct m_sub_options ao_alsa_conf;
extern const struct m_obj_list vf_obj_list;
extern const struct m_obj_list af_obj_list;
@@ -648,6 +649,9 @@ const m_option_t mp_opts[] = {
OPT_SUBSTRUCT("", gl_video_opts, gl_video_conf, 0),
OPT_SUBSTRUCT("", vo_opengl_opts, vo_opengl_conf, 0),
#endif
+#if HAVE_ALSA
+ OPT_SUBSTRUCT("", ao_alsa_opts, ao_alsa_conf, 0),
+#endif
#if HAVE_ENCODING
OPT_SUBSTRUCT("", encode_opts, encode_config, 0),
diff --git a/options/options.h b/options/options.h
index 59ed7b4a43..7d6701cd1e 100644
--- a/options/options.h
+++ b/options/options.h
@@ -334,6 +334,7 @@ typedef struct MPOpts {
struct gl_video_opts *gl_video_opts;
struct vo_opengl_opts *vo_opengl_opts;
+ struct ao_alsa_opts *ao_alsa_opts;
} MPOpts;
extern const m_option_t mp_opts[];