diff options
| author | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2013-02-10 09:50:12 +0100 |
|---|---|---|
| committer | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2013-02-21 22:23:08 +0100 |
| commit | 41c1749f46e0e36af39be2487ee992cbf18e6679 (patch) | |
| tree | be025ef8861bed3f6ce95685044ba45c807b971f /core | |
| parent | 08952f23dd4b069990b027dc06b10affcb4bc361 (diff) | |
| download | mpv-41c1749f46e0e36af39be2487ee992cbf18e6679.tar.bz2 mpv-41c1749f46e0e36af39be2487ee992cbf18e6679.tar.xz | |
core: move `xineramascreen` to `MPOpts` as `vo_screen_id`
This is a small cleanup in preparation for the next commit.
Diffstat (limited to 'core')
| -rw-r--r-- | core/cfg-mplayer.h | 4 | ||||
| -rw-r--r-- | core/defaultopts.c | 1 | ||||
| -rw-r--r-- | core/options.h | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/core/cfg-mplayer.h b/core/cfg-mplayer.h index 621d026d0d..23c4bedee8 100644 --- a/core/cfg-mplayer.h +++ b/core/cfg-mplayer.h @@ -612,8 +612,8 @@ const m_option_t mplayer_opts[]={ {"heartbeat-cmd", &heartbeat_cmd, CONF_TYPE_STRING, 0, 0, 0, NULL}, {"mouseinput", &vo_nomouse_input, CONF_TYPE_FLAG, 0, 1, 0, NULL}, - {"screen", &xinerama_screen, CONF_TYPE_CHOICE, CONF_RANGE, - .min = 0, .max = 32, M_CHOICES(({"all", -2}, {"current", -1}))}, + OPT_CHOICE_OR_INT("screen", vo_screen_id, 0, 0, 32, + ({"all", -2}, {"current", -1})), OPT_INTRANGE("brightness", vo_gamma_brightness, 0, -100, 100), OPT_INTRANGE("saturation", vo_gamma_saturation, 0, -100, 100), diff --git a/core/defaultopts.c b/core/defaultopts.c index 1119ef0633..b6e7f28524 100644 --- a/core/defaultopts.c +++ b/core/defaultopts.c @@ -22,6 +22,7 @@ void set_default_mplayer_options(struct MPOpts *opts) .monitor_pixel_aspect = 1.0, .vo_panscanrange = 1.0, .cursor_autohide_delay = 1000, + .vo_screen_id = -1, .vo_gamma_gamma = 1000, .vo_gamma_brightness = 1000, .vo_gamma_contrast = 1000, diff --git a/core/options.h b/core/options.h index 3d4e014c6e..8e64c07723 100644 --- a/core/options.h +++ b/core/options.h @@ -18,6 +18,7 @@ typedef struct MPOpts { int ao_buffersize; int vo_screenwidth; int vo_screenheight; + int vo_screen_id; struct m_geometry vo_geometry; struct m_geometry vo_autofit; struct m_geometry vo_autofit_larger; |