path: root/core/cfg-mplayer.h
diff options
authorwm4 <wm4@nowhere>2013-01-23 10:56:11 +0100
committerwm4 <wm4@nowhere>2013-01-23 10:56:11 +0100
commit4c56baba4048f8a881253d4fe2f49c2715c77376 (patch)
treed75891df8cd30c404072f9b67b6da21188b79ba8 /core/cfg-mplayer.h
parentf2dcdca0c2dc5f904323659b65b29a2b6f00fd88 (diff)
options: move -geometry parsing to m_option.c
This also means the option is verified on program start, not when the VO is created. The actual code becomes a bit more complex, because the screen width/height is not available at program start. The actual parsing code is still the same, with its unusual sscanf() usage.
Diffstat (limited to 'core/cfg-mplayer.h')
1 files changed, 1 insertions, 3 deletions
diff --git a/core/cfg-mplayer.h b/core/cfg-mplayer.h
index 8ef7e9abdd..5264784a56 100644
--- a/core/cfg-mplayer.h
+++ b/core/cfg-mplayer.h
@@ -37,7 +37,6 @@
extern char *lirc_configfile;
/* only used at startup (setting these values from configfile) */
-extern char *vo_geometry;
extern int stop_xscreensaver;
extern int mp_msg_color;
@@ -586,8 +585,7 @@ const m_option_t mplayer_opts[]={
// set screen dimensions (when not detectable or virtual!=visible)
OPT_INTRANGE("screenw", vo_screenwidth, CONF_GLOBAL, 0, 4096),
OPT_INTRANGE("screenh", vo_screenheight, CONF_GLOBAL, 0, 4096),
- // Geometry string
- {"geometry", &vo_geometry, CONF_TYPE_STRING, 0, 0, 0, NULL},
+ OPT_GEOMETRY("geometry", vo_geometry, 0),
OPT_MAKE_FLAGS("force-window-position", force_window_position, 0),
// vo name (X classname) and window title strings
OPT_STRING("name", vo_winname, 0),