Mercurial > mplayer.hg
diff cfg-mplayer.h @ 922:db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
author | lgb |
---|---|
date | Thu, 31 May 2001 22:32:58 +0000 |
parents | a2f935269c15 |
children | a8a34da9c17f |
line wrap: on
line diff
--- a/cfg-mplayer.h Thu May 31 18:08:24 2001 +0000 +++ b/cfg-mplayer.h Thu May 31 22:32:58 2001 +0000 @@ -26,6 +26,10 @@ extern int osd_level; extern int sub_unicode; +#ifdef HAVE_X11 +extern char *mDisplayName; +#endif + struct config conf[]={ /* name, pointer, type, flags, min, max */ {"include", cfg_include, CONF_TYPE_FUNC_PARAM, 0, 0, 0}, /* this must be the first!!! */ @@ -34,6 +38,9 @@ {"vo", &video_driver, CONF_TYPE_STRING, 0, 0, 0}, {"dsp", &dsp, CONF_TYPE_STRING, 0, 0, 0}, {"mixer", &mixer_device, CONF_TYPE_STRING, 0, 0, 0}, +#ifdef HAVE_X11 + {"display", &mDisplayName, CONF_TYPE_STRING, 0, 0, 0}, +#endif {"master", &mixer_usemaster, CONF_TYPE_FLAG, 0, 0, 1}, {"osdlevel", &osd_level, CONF_TYPE_INT, CONF_RANGE, 0, 2 }, #ifdef HAVE_LIBCSS