diff options
Diffstat (limited to 'core/options.c')
| -rw-r--r-- | core/options.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/core/options.c b/core/options.c index b7dd5d7e62..f3e262fc17 100644 --- a/core/options.c +++ b/core/options.c @@ -38,15 +38,13 @@ #include "audio/filter/af.h" #include "audio/decode/dec_audio.h" #include "mp_core.h" +#include "osdep/priority.h" extern char *lirc_configfile; extern int mp_msg_color; extern int mp_msg_module; -/* from dec_audio, currently used for ac3surround decoder only */ -extern int fakemono; - extern int dvd_speed; /* stream/stream_dvd.c */ /* defined in demux: */ @@ -452,9 +450,6 @@ const m_option_t mp_opts[] = { // ------------------------- codec/vfilter options -------------------- - // MP3-only: select stereo/left/right - {"stereo", &fakemono, CONF_TYPE_INT, CONF_RANGE, 0, 2, NULL}, - {"af*", &af_cfg.list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL}, OPT_SETTINGSLIST("vf*", vf_settings, 0, (void *) &vf_obj_list), @@ -549,8 +544,6 @@ const m_option_t mp_opts[] = { {"no", 0}, {"yes", 1}, {"", 1})), OPT_FLAG("gapless-audio", gapless_audio, 0), - // override audio buffer size (used only by -ao oss/win32, obsolete) - OPT_INT("abs", ao_buffersize, 0), // set screen dimensions (when not detectable or virtual!=visible) OPT_INTRANGE("screenw", vo.screenwidth, CONF_GLOBAL, 0, 4096), @@ -593,10 +586,10 @@ const m_option_t mp_opts[] = { OPT_CHOICE_OR_INT("cursor-autohide", vo.cursor_autohide_delay, 0, 0, 30000, ({"no", -1}, {"always", -2})), + OPT_FLAG("stop-screensaver", stop_screensaver, 0), OPT_INT64("wid", vo.WinID, CONF_GLOBAL), #ifdef CONFIG_X11 - OPT_FLAG("stop-xscreensaver", vo.stop_screensaver, 0), OPT_STRINGLIST("fstype", vo.fstype_list, 0), #endif OPT_STRING("heartbeat-cmd", heartbeat_cmd, 0), @@ -710,6 +703,7 @@ const m_option_t mp_opts[] = { OPT_STRING("of", encode_output.format, CONF_GLOBAL), OPT_STRINGLIST("ofopts*", encode_output.fopts, CONF_GLOBAL), OPT_FLOATRANGE("ofps", encode_output.fps, CONF_GLOBAL, 0.0, 1000000.0), + OPT_FLOATRANGE("omaxfps", encode_output.maxfps, CONF_GLOBAL, 0.0, 1000000.0), OPT_STRING("ovc", encode_output.vcodec, CONF_GLOBAL), OPT_STRINGLIST("ovcopts*", encode_output.vopts, CONF_GLOBAL), OPT_STRING("oac", encode_output.acodec, CONF_GLOBAL), @@ -739,7 +733,6 @@ const struct MPOpts mp_default_opts = { .mixer_init_volume = -1, .mixer_init_mute = -1, .volstep = 3, - .ao_buffersize = -1, .vo = { .video_driver_list = NULL, .cursor_autohide_delay = 1000, @@ -748,7 +741,6 @@ const struct MPOpts mp_default_opts = { .fs = false, .screen_id = -1, .fsscreen_id = -1, - .stop_screensaver = 1, .nomouse_input = 0, .enable_mouse_movements = 1, .fsmode = 0, @@ -761,6 +753,7 @@ const struct MPOpts mp_default_opts = { }, .wintitle = "mpv - ${media-title}", .heartbeat_interval = 30.0, + .stop_screensaver = 1, .gamma_gamma = 1000, .gamma_brightness = 1000, .gamma_contrast = 1000, |