video: remove -x/-y/-xy options

-x/-y were rather useless and obscure. The only use I can see is
forcing a specific aspect ratio without having to calculate the aspect
ratio float value (although --aspect takes values of the form w:h).
This can be also done with --geometry and --no-keepaspect. There was
also a comment that -x/-y is useful for -vm, although I don't see how
this is useful as it still messes up aspect ratio.

-xy is mostly obsolete. It does two things: a) set the window width to
a pixel value, b) scale the window size by a factor. a) is already done
by --autofit (--autofit=num does exactly the same thing as --xy=num, if
num >= 8). b) is not all that useful, so we just drop that
functionality.

2 files changed, 0 insertions, 7 deletions

diff --git a/core/cfg-mplayer.h b/core/cfg-mplayer.h
index 54fa3f3ab5..fed5d999e2 100644
--- a/core/cfg-mplayer.h
+++ b/core/cfg-mplayer.h
@@ -483,7 +483,6 @@ const m_option_t common_opts[] = {
     {"ssf", (void *) scaler_filter_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
     OPT_FLOATRANGE("aspect", movie_aspect, 0, 0.1, 10.0),
     OPT_FLAG_CONSTANTS("no-aspect", movie_aspect, 0, 0, 0),
-    OPT_FLOATRANGE("xy", screen_size_xy, 0, 0.001, 4096),
 
     OPT_FLAG_CONSTANTS("flip", flip, 0, 0, 1),
 
@@ -579,9 +578,6 @@ const m_option_t mplayer_opts[]={
 
     {"edlout", &edl_output_filename,  CONF_TYPE_STRING, 0, 0, 0, NULL},
 
-    // force window width/height or resolution (with -vm)
-    OPT_INTRANGE("x", screen_size_x, 0, 0, 4096),
-    OPT_INTRANGE("y", screen_size_y, 0, 0, 4096),
     // set screen dimensions (when not detectable or virtual!=visible)
     OPT_INTRANGE("screenw", vo_screenwidth, CONF_GLOBAL, 0, 4096),
     OPT_INTRANGE("screenh", vo_screenheight, CONF_GLOBAL, 0, 4096),
diff --git a/core/options.h b/core/options.h
index 3cd0132847..d1c58fdda9 100644
--- a/core/options.h
+++ b/core/options.h
@@ -16,8 +16,6 @@ typedef struct MPOpts {
     float softvol_max;
     int gapless_audio;
     int ao_buffersize;
-    int screen_size_x;
-    int screen_size_y;
     int vo_screenwidth;
     int vo_screenheight;
     struct m_geometry vo_geometry;
@@ -110,7 +108,6 @@ typedef struct MPOpts {
     float drc_level;
     struct m_obj_settings *vf_settings;
     float movie_aspect;
-    float screen_size_xy;
     int flip;
     int vd_use_dr1;
     char **sub_name;