diff options
| author | lgb <lgb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-05-31 22:32:58 +0000 |
|---|---|---|
| committer | lgb <lgb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-05-31 22:32:58 +0000 |
| commit | f61ffa92b939a9e4c1dbe22a15e0398ea17c3075 (patch) | |
| tree | 68b27b581fced1a21cef5bf2c96c41a8d73dec8d /cfg-mplayer.h | |
| parent | d7f6f3e341ae2a53c82ec0056257f110c10fdb57 (diff) | |
| download | mpv-f61ffa92b939a9e4c1dbe22a15e0398ea17c3075.tar.bz2 mpv-f61ffa92b939a9e4c1dbe22a15e0398ea17c3075.tar.xz | |
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@923 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'cfg-mplayer.h')
| -rw-r--r-- | cfg-mplayer.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/cfg-mplayer.h b/cfg-mplayer.h index 227103bb93..c548283d8e 100644 --- a/cfg-mplayer.h +++ b/cfg-mplayer.h @@ -26,6 +26,10 @@ extern int vo_dbpp; 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 @@ struct config conf[]={ {"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 |