From e42a194062cb29e538f19d12902c1610c1b30aef Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 13 Mar 2018 12:34:26 +0100 Subject: vo: move display-fps internal option value to VO opts Removes the awkward notification through VO_EVENT_WIN_STATE. Unfortunately, some awkwardness remains in mp_property_display_fps(), because the property has conflicting semantics with the option. --- player/command.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'player/command.c') diff --git a/player/command.c b/player/command.c index 67cc1db250..628dc98a34 100644 --- a/player/command.c +++ b/player/command.c @@ -2724,17 +2724,10 @@ static int mp_property_display_fps(void *ctx, struct m_property *prop, int action, void *arg) { MPContext *mpctx = ctx; - double fps = mpctx->opts->frame_drop_fps; - struct vo *vo = mpctx->video_out; - if (vo) - fps = vo_get_display_fps(vo); - if (action == M_PROPERTY_SET) { - int ret = mp_property_generic_option(mpctx, prop, action, arg); - if (vo) - vo_event(vo, VO_EVENT_WIN_STATE); - return ret; - } - return m_property_double_ro(action, arg, fps); + double fps = mpctx->video_out ? vo_get_display_fps(mpctx->video_out) : 0; + if (fps > 0 && action != M_PROPERTY_SET) + return m_property_double_ro(action, arg, fps); + return mp_property_generic_option(mpctx, prop, action, arg); } static int mp_property_framedrop(void *ctx, struct m_property *prop, -- cgit v1.2.3