summaryrefslogtreecommitdiffstats
path: root/options/options.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-09-21 15:56:54 +0200
committerwm4 <wm4@nowhere>2016-09-21 17:35:00 +0200
commit75d12c174f0b5bb03c71872241f965ac674221d7 (patch)
tree39fb3f2026bdad9c3daece97183d048bef3b96be /options/options.c
parent14c232bdbfbb16f427632d579430fa1a522f7f73 (diff)
downloadmpv-75d12c174f0b5bb03c71872241f965ac674221d7.tar.bz2
mpv-75d12c174f0b5bb03c71872241f965ac674221d7.tar.xz
options: make input options generally runtime-settable
Diffstat (limited to 'options/options.c')
-rw-r--r--options/options.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/options/options.c b/options/options.c
index 1476b384b5..3512ee15e8 100644
--- a/options/options.c
+++ b/options/options.c
@@ -505,8 +505,6 @@ const m_option_t mp_opts[] = {
OPT_CHOICE("force-window", force_vo, 0,
({"no", 0}, {"yes", 1}, {"immediate", 2})),
- OPT_FLAG("window-dragging", allow_win_drag, CONF_GLOBAL),
-
OPT_CHOICE("softvol", softvol, 0,
({"no", SOFTVOL_NO},
{"yes", SOFTVOL_YES},
@@ -653,14 +651,14 @@ const m_option_t mp_opts[] = {
OPT_FLAG("input-terminal", consolecontrols, UPDATE_TERM),
- OPT_STRING("input-file", input_file, M_OPT_FILE),
- OPT_STRING("input-ipc-server", ipc_path, M_OPT_FILE | M_OPT_FIXED),
+ OPT_STRING("input-file", input_file, M_OPT_FILE | UPDATE_INPUT),
+ OPT_STRING("input-ipc-server", ipc_path, M_OPT_FILE | UPDATE_INPUT),
OPT_SUBSTRUCT("screenshot", screenshot_image_opts, screenshot_conf, 0),
OPT_STRING("screenshot-template", screenshot_template, 0),
OPT_STRING("screenshot-directory", screenshot_directory, 0),
- OPT_SUBSTRUCT("input", input_opts, input_config, 0),
+ OPT_SUBSTRUCT("", input_opts, input_config, 0),
OPT_PRINT("list-protocols", stream_print_proto_list),
OPT_PRINT("help", print_help),
@@ -777,7 +775,6 @@ const struct MPOpts mp_default_opts = {
.audio_buffer = 0.2,
.audio_device = "auto",
.audio_client_name = "mpv",
- .allow_win_drag = 1,
.wintitle = "${?media-title:${media-title}}${!media-title:No file} - mpv",
.heartbeat_interval = 30.0,
.stop_screensaver = 1,