From 35e6d1abe0315caee3f21ca3853d76423baa0c91 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Tue, 10 Jun 2014 22:09:27 +0200
Subject: stream_dvd, stream_dvdnav, stream_bluray: remove global option
 variables

---
 options/options.c | 12 +++++++-----
 options/options.h |  6 ++++++
 2 files changed, 13 insertions(+), 5 deletions(-)

(limited to 'options')

diff --git a/options/options.c b/options/options.c
index 12057c6e9a..09820aa6bf 100644
--- a/options/options.c
+++ b/options/options.c
@@ -171,16 +171,16 @@ const m_option_t mp_opts[] = {
     OPT_INTRANGE("cache-pause-restart", stream_cache_unpause, 0, 0, 0x7fffffff),
 
 #if HAVE_DVDREAD || HAVE_DVDNAV
-    {"dvd-device", &dvd_device,  CONF_TYPE_STRING, 0, 0, 0, NULL},
-    {"dvd-speed", &dvd_speed, CONF_TYPE_INT, 0, 0, 0, NULL},
-    {"dvd-angle", &dvd_angle, CONF_TYPE_INT, CONF_RANGE, 1, 99, NULL},
+    OPT_STRING("dvd-device", dvd_device, 0),
+    OPT_INT("dvd-speed", dvd_speed, 0),
+    OPT_INTRANGE("dvd-angle", dvd_angle, 0, 1, 99),
 #endif /* HAVE_DVDREAD */
     OPT_INTPAIR("chapter", chapterrange, 0),
     OPT_CHOICE_OR_INT("edition", edition_id, 0, 0, 8190,
                       ({"auto", -1})),
 #if HAVE_LIBBLURAY
-    {"bluray-device",  &bluray_device,  CONF_TYPE_STRING, 0,          0,  0, NULL},
-    {"bluray-angle",   &bluray_angle,   CONF_TYPE_INT,    CONF_RANGE, 0, 999, NULL},
+    OPT_STRING("bluray-device", bluray_device, 0),
+    OPT_INTRANGE("bluray-angle", bluray_angle, 0, 0, 999),
 #endif /* HAVE_LIBBLURAY */
 
     OPT_STRINGLIST("http-header-fields", network_http_header_fields, 0),
@@ -671,6 +671,8 @@ const struct MPOpts mp_default_opts = {
 
     .index_mode = -1,
 
+    .dvd_angle = 1,
+
     .ad_lavc_param = {
         .ac3drc = 1.,
         .downmix = 1,
diff --git a/options/options.h b/options/options.h
index 229361f767..7e8c22451d 100644
--- a/options/options.h
+++ b/options/options.h
@@ -244,6 +244,12 @@ typedef struct MPOpts {
     struct dvb_params *stream_dvb_opts;
 
     char *cdrom_device;
+    int dvd_title;
+    int dvd_angle;
+    int dvd_speed;
+    char *dvd_device;
+    int bluray_angle;
+    char *bluray_device;
 
     struct lavc_param {
         int fast;
-- 
cgit v1.2.3