summaryrefslogtreecommitdiffstats
path: root/options
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-09-22 20:56:34 +0200
committerwm4 <wm4@nowhere>2016-09-22 20:57:06 +0200
commit075edc6feea0273bacf4ea26e8866c32d83e3ad8 (patch)
tree32cf49a6fc8d94a0e93425cdf0c2b61d24d87594 /options
parent2ac74977c5f6561e33ad37c68b9da47739c7fd6c (diff)
downloadmpv-075edc6feea0273bacf4ea26e8866c32d83e3ad8.tar.bz2
mpv-075edc6feea0273bacf4ea26e8866c32d83e3ad8.tar.xz
player: make audio-channels etc. runtime settable
If one of the audio output format options is set, brually reinit the audio chain. Since the audio-channels property is still mapped to the deprecated read-only property, "options/audio-channels" currently has to be used, e.g. "cycle-values options/audio-channels 2 7.1".
Diffstat (limited to 'options')
-rw-r--r--options/m_option.h3
-rw-r--r--options/options.c8
2 files changed, 6 insertions, 5 deletions
diff --git a/options/m_option.h b/options/m_option.h
index 92d0575db8..6a7b4accc9 100644
--- a/options/m_option.h
+++ b/options/m_option.h
@@ -388,7 +388,8 @@ struct m_option {
#define UPDATE_BUILTIN_SCRIPTS (1 << 11) // osc/ytdl
#define UPDATE_IMGPAR (1 << 12) // video image params overrides
#define UPDATE_INPUT (1 << 13) // mostly --input-* options
-#define UPDATE_OPT_LAST (1 << 13)
+#define UPDATE_AUDIO (1 << 14) // --audio-channels etc.
+#define UPDATE_OPT_LAST (1 << 14)
// All bits between _FIRST and _LAST (inclusive)
#define UPDATE_OPTS_MASK \
diff --git a/options/options.c b/options/options.c
index cd51842ea3..f401b00803 100644
--- a/options/options.c
+++ b/options/options.c
@@ -384,10 +384,10 @@ const m_option_t mp_opts[] = {
// force video/audio rate:
OPT_DOUBLE("fps", force_fps, CONF_MIN, .min = 0),
- OPT_INTRANGE("audio-samplerate", force_srate, 0, 1000, 16*48000),
- OPT_CHANNELS("audio-channels", audio_output_channels, 0),
- OPT_AUDIOFORMAT("audio-format", audio_output_format, 0),
- OPT_FLAG("audio-normalize-downmix", audio_normalize, 0),
+ OPT_INTRANGE("audio-samplerate", force_srate, UPDATE_AUDIO, 1000, 16*48000),
+ OPT_CHANNELS("audio-channels", audio_output_channels, UPDATE_AUDIO),
+ OPT_AUDIOFORMAT("audio-format", audio_output_format, UPDATE_AUDIO),
+ OPT_FLAG("audio-normalize-downmix", audio_normalize, UPDATE_AUDIO),
OPT_DOUBLE("speed", playback_speed, M_OPT_RANGE, .min = 0.01, .max = 100.0),
OPT_FLAG("audio-pitch-correction", pitch_correction, 0),