diff options
| author | wm4 <wm4@nowhere> | 2013-01-26 22:37:47 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-01-27 13:30:53 +0100 |
| commit | a243acb1deccd9526f3867d9a6500743dc190f95 (patch) | |
| tree | b33cac6a373bc42f6c685d6f9a0281acffcd5007 /core/cfg-mplayer.h | |
| parent | 9747227e47326851c41fceb386d72f498fba7f87 (diff) | |
| download | mpv-a243acb1deccd9526f3867d9a6500743dc190f95.tar.bz2 mpv-a243acb1deccd9526f3867d9a6500743dc190f95.tar.xz | |
x11: cleanup, refactor
Move things that are used by vo_xv only into vo_xv, same for vo_x11.
Rename some functions exported by x11_common, like vo_init to
vo_x11_common. Make functions not used outsode of x11_common.c private
to that file. Eliminate all global variables defined by x11_common
(except error handler and colormap stuff).
There shouldn't be any functional changes, and only code is moved
around. There are some minor simplifications in the X11 init code, as
we completely remove the ability to initialize X11 and X11+VO
separately (see commit b4d9647 "mplayer: do not create X11 state in player frontend"),
and the respective functions are conflated into vo_x11_init() and
vo_x11_uninit().
Diffstat (limited to 'core/cfg-mplayer.h')
| -rw-r--r-- | core/cfg-mplayer.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/core/cfg-mplayer.h b/core/cfg-mplayer.h index eb3b805622..9bf6d53d6d 100644 --- a/core/cfg-mplayer.h +++ b/core/cfg-mplayer.h @@ -36,9 +36,6 @@ extern char *lirc_configfile; -/* only used at startup (setting these values from configfile) */ -extern int stop_xscreensaver; - extern int mp_msg_color; extern int mp_msg_module; @@ -615,8 +612,8 @@ const m_option_t mplayer_opts[]={ {"refreshrate",&vo_refresh_rate,CONF_TYPE_INT,CONF_RANGE, 0,100, NULL}, {"wid", &WinID, CONF_TYPE_INT64, 0, 0, 0, NULL}, #ifdef CONFIG_X11 - {"stop-xscreensaver", &stop_xscreensaver, CONF_TYPE_FLAG, 0, 0, 1, NULL}, - {"fstype", &vo_fstype_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL}, + OPT_MAKE_FLAGS("stop-xscreensaver", vo_stop_screensaver, 0), + OPT_STRINGLIST("fstype", vo_fstype_list, 0), #endif {"heartbeat-cmd", &heartbeat_cmd, CONF_TYPE_STRING, 0, 0, 0, NULL}, {"mouseinput", &vo_nomouse_input, CONF_TYPE_FLAG, 0, 1, 0, NULL}, |