From 3a637d411f603fd82ee0bf8a181ea20d60e7c88f Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Sun, 22 Dec 2013 13:11:22 +0100
Subject: options: move network related options to MPOpts

---
 options/options.c | 29 +++++++++--------------------
 options/options.h | 17 ++++++++---------
 2 files changed, 17 insertions(+), 29 deletions(-)

(limited to 'options')

diff --git a/options/options.c b/options/options.c
index 85b7a40cbe..0604c40b29 100644
--- a/options/options.c
+++ b/options/options.c
@@ -42,19 +42,6 @@
 #include "player/core.h"
 #include "osdep/priority.h"
 
-int   network_bandwidth=0;
-int   network_cookies_enabled = 0;
-char *network_useragent="mpv " VERSION;
-char *network_referrer=NULL;
-char **network_http_header_fields=NULL;
-int   network_tls_verify;
-char *network_tls_ca_file;
-
-extern char *lirc_configfile;
-
-extern int mp_msg_color;
-extern int mp_msg_module;
-
 /* defined in demux: */
 extern const m_option_t demux_rawaudio_opts[];
 extern const m_option_t demux_rawvideo_opts[];
@@ -279,18 +266,18 @@ const m_option_t mp_opts[] = {
     {"bluray-angle",   &bluray_angle,   CONF_TYPE_INT,    CONF_RANGE, 0, 999, NULL},
 #endif /* HAVE_LIBBLURAY */
 
-    {"http-header-fields", &network_http_header_fields, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL},
-    {"user-agent", &network_useragent, CONF_TYPE_STRING, 0, 0, 0, NULL},
-    {"referrer", &network_referrer, CONF_TYPE_STRING, 0, 0, 0, NULL},
-    {"cookies", &network_cookies_enabled, CONF_TYPE_FLAG, 0, 0, 1, NULL},
-    {"cookies-file", &cookies_file, CONF_TYPE_STRING, 0, 0, 0, NULL},
+    OPT_STRINGLIST("http-header-fields", network_http_header_fields, 0),
+    OPT_STRING("user-agent", network_useragent, 0),
+    OPT_STRING("referrer", network_referrer, 0),
+    OPT_FLAG("cookies", network_cookies_enabled, 0),
+    OPT_STRING("cookies-file", network_cookies_file, 0),
     OPT_CHOICE("rtsp-transport", network_rtsp_transport, 0,
                ({"lavf", 0},
                 {"udp", 1},
                 {"tcp", 2},
                 {"http", 3})),
-    {"tls-verify", &network_tls_verify, CONF_TYPE_FLAG, 0, 0, 0, NULL},
-    {"tls-ca-file", &network_tls_ca_file, CONF_TYPE_STRING, 0, 0, 0, NULL},
+    OPT_FLAG("tls-verify", network_tls_verify, 0),
+    OPT_STRING("tls-ca-file", network_tls_ca_file, 0),
 
 // ------------------------- demuxer options --------------------
 
@@ -753,6 +740,8 @@ const struct MPOpts mp_default_opts = {
 
     .index_mode = -1,
 
+    .network_useragent = "mpv " VERSION,
+
     .ad_lavc_param = {
         .ac3drc = 1.,
         .downmix = 1,
diff --git a/options/options.h b/options/options.h
index e694216fa8..1d997d363b 100644
--- a/options/options.h
+++ b/options/options.h
@@ -218,6 +218,14 @@ typedef struct MPOpts {
     int hwdec_api;
     char *hwdec_codecs;
 
+    int network_cookies_enabled;
+    char *network_cookies_file;
+    char *network_useragent;
+    char *network_referrer;
+    char **network_http_header_fields;
+    int network_tls_verify;
+    char *network_tls_ca_file;
+
     struct lavc_param {
         int fast;
         char *skip_loop_filter_str;
@@ -289,15 +297,6 @@ typedef struct MPOpts {
     } encode_output;
 } MPOpts;
 
-// Should be moved into MPOpts
-extern char **network_http_header_fields;
-extern char *network_useragent;
-extern char *network_referrer;
-extern int   network_cookies_enabled;
-extern int   network_tls_verify;
-extern char *network_tls_ca_file;
-extern char *cookies_file;
-
 extern const m_option_t mp_opts[];
 extern const struct MPOpts mp_default_opts;
 
-- 
cgit v1.2.3