vo: remove and cleanup globals

Removes almost every global variabel in vo.h and puts them in a special struct
in MPOpts for video output related options.

Also we completly remove the options/globals pts and refresh rate because
they were unused.

1 files changed, 24 insertions, 12 deletions

diff --git a/core/defaultopts.c b/core/defaultopts.c
index a3c315b186..b551f05da1 100644
--- a/core/defaultopts.c
+++ b/core/defaultopts.c
@@ -18,18 +18,30 @@ void set_default_mplayer_options(struct MPOpts *opts)
         .mixer_init_volume = -1,
         .mixer_init_mute = -1,
         .ao_buffersize = -1,
-        .vo_wintitle = "mpv - ${media-title}",
-        .monitor_pixel_aspect = 1.0,
-        .vo_panscanrange = 1.0,
-        .cursor_autohide_delay = 1000,
-        .vo_screen_id = -1,
-        .vo_fsscreen_id = -1,
-        .vo_gamma_gamma = 1000,
-        .vo_gamma_brightness = 1000,
-        .vo_gamma_contrast = 1000,
-        .vo_gamma_saturation = 1000,
-        .vo_gamma_hue = 1000,
-        .vo_stop_screensaver = 1,
+        .vo = {
+            .cursor_autohide_delay = 1000,
+            .monitor_pixel_aspect = 1.0,
+            .panscanrange = 1.0,
+            .fs = false,
+            .screen_id = -1,
+            .fsscreen_id = -1,
+            .vsync = 1,
+            .stop_screensaver = 1,
+            .nomouse_input = 0,
+            .fsmode = 0,
+            .panscan = 0.0f,
+            .keepaspect = 1,
+            .border = 1,
+            .colorkey = 0x0000ff00, // default colorkey is green
+                        // (0xff000000 means that colorkey has been disabled)
+            .WinID = -1,
+        },
+        .wintitle = "mpv - ${media-title}",
+        .gamma_gamma = 1000,
+        .gamma_brightness = 1000,
+        .gamma_contrast = 1000,
+        .gamma_saturation = 1000,
+        .gamma_hue = 1000,
         .osd_level = 1,
         .osd_duration = 1000,
         .loop_times = -1,