From 75d12c174f0b5bb03c71872241f965ac674221d7 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Wed, 21 Sep 2016 15:56:54 +0200
Subject: options: make input options generally runtime-settable

---
 options/m_option.h | 3 ++-
 options/options.c  | 9 +++------
 options/options.h  | 1 -
 3 files changed, 5 insertions(+), 8 deletions(-)

(limited to 'options')

diff --git a/options/m_option.h b/options/m_option.h
index 63ba4fac03..1744023663 100644
--- a/options/m_option.h
+++ b/options/m_option.h
@@ -387,7 +387,8 @@ struct m_option {
 #define UPDATE_OSD              (1 << 10) // related to OSD rendering
 #define UPDATE_BUILTIN_SCRIPTS  (1 << 11) // osc/ytdl
 #define UPDATE_IMGPAR           (1 << 12) // video image params overrides
-#define UPDATE_OPT_LAST         (1 << 12)
+#define UPDATE_INPUT            (1 << 13) // mostly --input-* options
+#define UPDATE_OPT_LAST         (1 << 13)
 
 // All bits between _FIRST and _LAST (inclusive)
 #define UPDATE_OPTS_MASK \
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,
diff --git a/options/options.h b/options/options.h
index b148a3dbdc..48654c4296 100644
--- a/options/options.h
+++ b/options/options.h
@@ -101,7 +101,6 @@ typedef struct MPOpts {
     double audio_buffer;
 
     mp_vo_opts *vo;
-    int allow_win_drag;
 
     char *wintitle;
     char *media_title;
-- 
cgit v1.2.3