summaryrefslogtreecommitdiffstats
path: root/options
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-09-05 21:07:34 +0200
committerwm4 <wm4@nowhere>2016-09-05 21:26:39 +0200
commit1d9032f011a57a31f6a8ccc40a0aba08a8e74e0d (patch)
treec463f43610d73a127e2f62a6a39a669c38c36fd9 /options
parent13786dc643fe250a9560792ef342751585ea15e9 (diff)
downloadmpv-1d9032f011a57a31f6a8ccc40a0aba08a8e74e0d.tar.bz2
mpv-1d9032f011a57a31f6a8ccc40a0aba08a8e74e0d.tar.xz
audio/out: deprecate "exclusive" sub-options
And introduce a global option which does this. Or more precisely, this deprecates the global wasapi and coreaudio options, and adds a new one that merges their functionality. (Due to the way the sub-option deprecation mechanism works, this is simpler.)
Diffstat (limited to 'options')
-rw-r--r--options/options.c1
-rw-r--r--options/options.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/options/options.c b/options/options.c
index e2bd3d8d95..b620ab9bc3 100644
--- a/options/options.c
+++ b/options/options.c
@@ -481,6 +481,7 @@ const m_option_t mp_opts[] = {
OPT_SETTINGSLIST("ao-defaults", ao_defs, 0, &ao_obj_list,
.deprecation_message = "deprecated, use global options"),
OPT_STRING("audio-device", audio_device, 0),
+ OPT_FLAG("audio-exclusive", audio_exclusive, 0),
OPT_STRING("audio-client-name", audio_client_name, 0),
OPT_FLAG("audio-fallback-to-null", ao_null_fallback, 0),
OPT_FLAG("audio-stream-silence", audio_stream_silence, 0),
diff --git a/options/options.h b/options/options.h
index 7d735e93b4..376c62e989 100644
--- a/options/options.h
+++ b/options/options.h
@@ -86,6 +86,7 @@ typedef struct MPOpts {
struct m_obj_settings *audio_driver_list, *ao_defs;
char *audio_device;
+ int audio_exclusive;
char *audio_client_name;
int ao_null_fallback;
int audio_stream_silence;