diff options
| -rw-r--r-- | DOCS/man/en/options.rst | 9 | ||||
| -rw-r--r-- | core/cfg-mplayer.h | 4 | ||||
| -rw-r--r-- | video/out/x11_common.c | 10 | ||||
| -rw-r--r-- | video/out/x11_common.h | 2 |
4 files changed, 1 insertions, 24 deletions
diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst index e4ecf1e6ee..38a615ea72 100644 --- a/DOCS/man/en/options.rst +++ b/DOCS/man/en/options.rst @@ -463,15 +463,6 @@ Force demuxer type. Use a '+' before the name to force it, this will skip some checks! Give the demuxer name as printed by ``--demuxer=help``. ---display=<name> - (X11 only) - Specify the hostname and display number of the X server you want to - display on. - - *EXAMPLE*: - - ``--display=xtest.localdomain:0`` - --doubleclick-time=<milliseconds> Time in milliseconds to recognize two consecutive button presses as a double-click (default: 300). diff --git a/core/cfg-mplayer.h b/core/cfg-mplayer.h index aa5e8d66de..0e403e0769 100644 --- a/core/cfg-mplayer.h +++ b/core/cfg-mplayer.h @@ -576,10 +576,6 @@ const m_option_t mplayer_opts[]={ {"edlout", &edl_output_filename, CONF_TYPE_STRING, 0, 0, 0, NULL}, -#ifdef CONFIG_X11 - {"display", &mDisplayName, CONF_TYPE_STRING, 0, 0, 0, NULL}, -#endif - // 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), diff --git a/video/out/x11_common.c b/video/out/x11_common.c index 19094f24cd..05fae825fc 100644 --- a/video/out/x11_common.c +++ b/video/out/x11_common.c @@ -87,8 +87,6 @@ int stop_xscreensaver = 1; static int dpms_disabled = 0; -char *mDisplayName = NULL; - char **vo_fstype_list; /* 1 means that the WM is metacity (broken as hell) */ @@ -410,13 +408,7 @@ int vo_init(struct vo *vo) XSetErrorHandler(x11_errorhandler); -#if 0 - if (!mDisplayName) - if (!(mDisplayName = getenv("DISPLAY"))) - mDisplayName = strdup(":0.0"); -#else - dispName = XDisplayName(mDisplayName); -#endif + dispName = XDisplayName(NULL); mp_msg(MSGT_VO, MSGL_V, "X11 opening display: %s\n", dispName); diff --git a/video/out/x11_common.h b/video/out/x11_common.h index cb8b39a3b1..a968724842 100644 --- a/video/out/x11_common.h +++ b/video/out/x11_common.h @@ -115,8 +115,6 @@ extern int metacity_hack; extern char** vo_fstype_list; -extern char *mDisplayName; - struct vo_x11_state *vo_x11_init_state(void); int vo_init(struct vo *vo); void vo_uninit(struct vo_x11_state *x11); |