summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/cfg-mplayer.h3
-rw-r--r--core/m_option.h1
2 files changed, 3 insertions, 1 deletions
diff --git a/core/cfg-mplayer.h b/core/cfg-mplayer.h
index 5bc07c8f34..aa5e8d66de 100644
--- a/core/cfg-mplayer.h
+++ b/core/cfg-mplayer.h
@@ -636,7 +636,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},
- {"xineramascreen", &xinerama_screen, CONF_TYPE_INT, CONF_RANGE, -2, 32, NULL},
+ {"screen", &xinerama_screen, CONF_TYPE_CHOICE, CONF_RANGE,
+ .min = 0, .max = 32, M_CHOICES(({"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/m_option.h b/core/m_option.h
index 30bd6a9ff2..7fec11895a 100644
--- a/core/m_option.h
+++ b/core/m_option.h
@@ -175,6 +175,7 @@ struct m_sub_options {
#define CONF_TYPE_OBJ_PARAMS (&m_option_type_obj_params)
#define CONF_TYPE_TIME (&m_option_type_time)
#define CONF_TYPE_TIME_SIZE (&m_option_type_time_size)
+#define CONF_TYPE_CHOICE (&m_option_type_choice)
// Possible option values. Code is allowed to access option data without going
// through this union. It serves for self-documentation and to get minimal