From 5e30e7a04125e3c503160a76bbfe9361bff561fd Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Thu, 8 Sep 2016 21:46:48 +0200
Subject: stream_dvd, stream_dvdnav: remove weird option parsing stuff

Same deal as with stream_bluray.

Untested because I don't give a fuck about your shitty DVDs.
---
 options/options.h | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'options/options.h')

diff --git a/options/options.h b/options/options.h
index 34ca1f320e..b0871a1d8f 100644
--- a/options/options.h
+++ b/options/options.h
@@ -290,10 +290,6 @@ typedef struct MPOpts {
     struct stream_lavf_params *stream_lavf_opts;
 
     char *cdrom_device;
-    int dvd_title;
-    int dvd_angle;
-    int dvd_speed;
-    char *dvd_device;
     char *bluray_device;
 
     double mf_fps;
@@ -318,11 +314,19 @@ typedef struct MPOpts {
     char *input_file;
 
     struct gl_video_opts *gl_video_opts;
+    struct dvd_opts *dvd_opts;
 } MPOpts;
 
+struct dvd_opts {
+    int angle;
+    int speed;
+    char *device;
+};
+
 extern const m_option_t mp_opts[];
 extern const struct MPOpts mp_default_opts;
 extern const struct m_sub_options vo_sub_opts;
 extern const struct m_sub_options stream_cache_conf;
+extern const struct m_sub_options dvd_conf;
 
 #endif
-- 
cgit v1.2.3