1 files changed, 45 insertions, 18 deletions

diff --git a/core/options.h b/core/options.h
index 8806a66211..1eb111e33e 100644
--- a/core/options.h
+++ b/core/options.h
@@ -14,7 +14,6 @@ typedef struct mp_vo_opts {
     bool fs;
     int screen_id;
     int fsscreen_id;
-    int stop_screensaver;
     char *winname;
     char** fstype_list;
     int native_keyrepeat;
@@ -41,6 +40,8 @@ typedef struct mp_vo_opts {
     float force_monitor_aspect;
     float monitor_pixel_aspect;
     int force_window_position;
+
+    int native_fs;
 } mp_vo_opts;
 
 typedef struct MPOpts {
@@ -56,7 +57,6 @@ typedef struct MPOpts {
     int volstep;
     float softvol_max;
     int gapless_audio;
-    int ao_buffersize;
 
     mp_vo_opts vo;
 
@@ -70,6 +70,7 @@ typedef struct MPOpts {
     int gamma_saturation;
     int gamma_hue;
 
+    int stop_screensaver;
     int fullscreen;
     int requested_colorspace;
     int requested_input_range;
@@ -81,8 +82,9 @@ typedef struct MPOpts {
     int osd_level;
     int osd_duration;
     int osd_fractions;
-    char *vobsub_name;
     int untimed;
+    char *stream_capture;
+    char *stream_dump;
     int loop_times;
     int ordered_chapters;
     int chapter_merge_threshold;
@@ -117,7 +119,6 @@ typedef struct MPOpts {
     int player_idle_mode;
     int slave_mode;
     int consolecontrols;
-    int doubleclick_time;
     int list_properties;
     struct m_rel_time play_start;
     struct m_rel_time play_end;
@@ -125,6 +126,8 @@ typedef struct MPOpts {
     int play_frames;
     double step_sec;
     int64_t seek_to_byte;
+    int position_resume;
+    int position_save_on_quit;
     int pause;
     int keep_open;
     int audio_id;
@@ -134,12 +137,19 @@ typedef struct MPOpts {
     char **sub_lang;
     int audio_display;
     int sub_visibility;
+    int sub_pos;
+    float sub_delay;
+    float sub_fps;
+    float sub_speed;
     int forced_subs_only;
     char *quvi_format;
 
+    // subreader.c
+    int suboverlap_enabled;
+    char *sub_cp;
+
     char *audio_stream;
     int audio_stream_cache;
-    char *sub_stream;
     char *demuxer_name;
     char *audio_demuxer_name;
     char *sub_demuxer_name;
@@ -151,24 +161,26 @@ typedef struct MPOpts {
 
     double force_fps;
 
-    int audio_output_channels;
+    struct mp_chmap audio_output_channels;
     int audio_output_format;
     int force_srate;
     int dtshd;
     float playback_speed;
-    float drc_level;
     struct m_obj_settings *vf_settings;
     float movie_aspect;
     int flip;
-    int vd_use_dr1;
+    int field_dominance;
+    int divx_quality;
     char **sub_name;
     char **sub_paths;
     int sub_auto;
+    int sub_match_fuzziness;
     int osd_bar_visible;
     float osd_bar_align_x;
     float osd_bar_align_y;
     float osd_bar_w;
     float osd_bar_h;
+    float osd_scale;
     struct osd_style_opts *osd_style;
     struct osd_style_opts *sub_text_style;
     float sub_scale;
@@ -185,17 +197,9 @@ typedef struct MPOpts {
     int ass_hinting;
 
     int hwdec_api;
+    char *hwdec_codecs;
 
     struct lavc_param {
-        int workaround_bugs;
-        int error_resilience;
-        int error_concealment;
-        int gray;
-        int idct_algo;
-        int debug;
-        int vismv;
-        int skip_top;
-        int skip_bottom;
         int fast;
         char *skip_loop_filter_str;
         char *skip_idct_str;
@@ -205,10 +209,17 @@ typedef struct MPOpts {
         char *avopt;
     } lavc_param;
 
+    struct ad_lavc_param {
+        float ac3drc;
+        int downmix;
+        char *avopt;
+    } ad_lavc_param;
+
     struct lavfdopts {
         int probesize;
         int probescore;
-        int analyzeduration;
+        float analyzeduration;
+        int allow_mimetype;
         char *format;
         char *cryptokey;
         char *avopt;
@@ -216,6 +227,7 @@ typedef struct MPOpts {
 
     struct input_conf {
         char *config_file;
+        int doubleclick_time;
         int key_fifo_size;
         int ar_delay;
         int ar_rate;
@@ -224,6 +236,10 @@ typedef struct MPOpts {
         int use_joystick;
         int use_lirc;
         int use_lircc;
+#ifdef CONFIG_COCOA
+        int use_ar;
+        int use_media_keys;
+#endif
         int default_bindings;
         int test;
     } input;
@@ -233,6 +249,7 @@ typedef struct MPOpts {
         char *format;
         char **fopts;
         float fps;
+        float maxfps;
         char *vcodec;
         char **vopts;
         char *acodec;
@@ -249,4 +266,14 @@ 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 char *cookies_file;
+
+extern const m_option_t mp_opts[];
+extern const struct MPOpts mp_default_opts;
+
 #endif