From 8baf773d0e9a02febde5a64c722a9bc233acff6e Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 9 Nov 2015 13:52:46 +0100 Subject: command: make display-fps property writable Has the same function as setting the option. This commit changes the property in a bunch of other ways. For example if the VO is not created, it will return the option value. --- player/command.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'player/command.c') diff --git a/player/command.c b/player/command.c index 27912354a5..6473de4af9 100644 --- a/player/command.c +++ b/player/command.c @@ -2574,14 +2574,16 @@ 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) - return M_PROPERTY_UNAVAILABLE; - - double fps = vo_get_display_fps(vo); - if (fps < 1) - return M_PROPERTY_UNAVAILABLE; - + 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); } -- cgit v1.2.3