RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-25 00:02:13 +00:00
Code Issues Releases Wiki Activity

options: remove --no-vsync

Browse Source 
Latest nvidia drivers ignore the application setting, so this switch
makes even less sense than before. It's still possible to control this
with VO specific suboptions.
This commit is contained in:
wm4 2013-03-06 00:24:34 +01:00
parent 3a0d647e0f
commit a1a9dc9c85
7 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
DOCS/man/en/options.rst
View File

@ -2341,9 +2341,6 @@
Set the startup volume. A value of -1 (the default) will not change the
volume. See also ``--softvol``.
--no-vsync
Tries to disable vsync. (Effective with some video outputs only.)
--wid=<ID>
(X11 and win32 only)
This tells mpv to attach to an existing window. The ID is interpreted as

2
core/cfg-mplayer.h
View File

@ -570,8 +570,6 @@ const m_option_t mplayer_opts[]={
OPT_INTRANGE("fsmode-dontuse", vo.fsmode, 0, 31, 4096),
OPT_INT("colorkey", vo.colorkey, 0),
OPT_INT("no-colorkey", vo.colorkey, 0x1000000),
// wait for v-sync (gl)
OPT_FLAG("vsync", vo.vsync, 1),
OPT_FLOATRANGE("panscan", vo.panscan, 0, 1.0, 99.0),
OPT_FLOATRANGE("panscanrange", vo.panscanrange, 0, -19.0, 99.0),
OPT_FLAG("force-rgba-osd-rendering", force_rgba_osd, 0),

1
core/defaultopts.c
View File

@ -25,7 +25,6 @@ void set_default_mplayer_options(struct MPOpts *opts)
.fs = false,
.screen_id = -1,
.fsscreen_id = -1,
.vsync = 1,
.stop_screensaver = 1,
.nomouse_input = 0,
.fsmode = 0,

1
core/options.h
View File

@ -11,7 +11,6 @@ typedef struct mp_vo_opts {
int screenheight;
int ontop;
bool fs;
int vsync;
int screen_id;
int fsscreen_id;
int stop_screensaver;

2
video/out/vo_opengl.c
View File

@ -2085,7 +2085,7 @@ static int preinit(struct vo *vo, const char *arg)
.colorspace = MP_CSP_DETAILS_DEFAULTS,
.use_npot = 1,
.use_pbo = hq,
.swap_interval = vo->opts->vsync,
.swap_interval = 1,
.dither_depth = hq ? 0 : -1,
.fbo_format = hq ? GL_RGB16 : GL_RGB,
.use_scale_sep = 1,

2
video/out/vo_opengl_old.c
View File

@ -2113,7 +2113,7 @@ static int preinit(struct vo *vo, const char *arg)
.use_rectangle = -1,
.ati_hack = -1,
.force_pbo = -1,
.swap_interval = vo->opts->vsync,
.swap_interval = 1,
.custom_prog = NULL,
.custom_tex = NULL,
.custom_tlin = 1,

13
video/out/vo_sdl.c
View File

@ -197,6 +197,7 @@ struct priv {
// options
int allow_sw;
int switch_mode;
int vsync;
};
static bool is_good_renderer(SDL_RendererInfo *ri,
@ -771,12 +772,8 @@ static int preinit(struct vo *vo, const char *arg)
SDL_HINT_DEFAULT);
// predefine MPV options (SDL env vars shall be overridden)
if (vo->opts->vsync)
SDL_SetHintWithPriority(SDL_HINT_RENDER_VSYNC, "1",
SDL_HINT_OVERRIDE);
else
SDL_SetHintWithPriority(SDL_HINT_RENDER_VSYNC, "0",
SDL_HINT_OVERRIDE);
SDL_SetHintWithPriority(SDL_HINT_RENDER_VSYNC, vc->vsync ? "1" : "0",
SDL_HINT_OVERRIDE);
if (SDL_InitSubSystem(SDL_INIT_VIDEO)) {
mp_msg(MSGT_VO, MSGL_ERR, "[sdl] SDL_Init failed\n");
@ -1025,11 +1022,13 @@ const struct vo_driver video_out_sdl = {
},
.priv_size = sizeof(struct priv),
.priv_defaults = &(const struct priv) {
.renderer_index = -1
.renderer_index = -1,
.vsync = 1,
},
.options = (const struct m_option []){
OPT_FLAG("sw", allow_sw, 0),
OPT_FLAG("switch-mode", switch_mode, 0),
OPT_FLAG("vsync", vsync, 0),
{NULL}
},
.preinit = preinit,