summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-11-15 15:38:02 +0100
committerwm4 <wm4@nowhere>2012-11-16 21:21:15 +0100
commit2628ff6224946bb7f3cf460f0c9c6969783e255c (patch)
tree4db337b1bb8160dd97737d1953176855a210a6b2 /video
parenta540881571e85be8bf3fd1d1d20a332645c97b92 (diff)
downloadmpv-2628ff6224946bb7f3cf460f0c9c6969783e255c.tar.bz2
mpv-2628ff6224946bb7f3cf460f0c9c6969783e255c.tar.xz
options: remove --display
Was used to set the X11 display. XDisplayName(NULL) does the same, using the DISPLAY environment variable instead.
Diffstat (limited to 'video')
-rw-r--r--video/out/x11_common.c10
-rw-r--r--video/out/x11_common.h2
2 files changed, 1 insertions, 11 deletions
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);