github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-09-28 17:52:52 +02:00
Code Releases Activity

command: merge window-scale code together

Browse Source 
Based on a small patch originally written by @avih. Instead of
duplicating the window-scale logic in update_window_scale, just call the
mp_property_current_window_scale function with the M_PROPERTY_SET action
and a NULL property.
This commit is contained in:
Dudemanguy 2021-08-09 08:51:50 -05:00
parent 8d4f10fcc0
commit 77f2fd97f8
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
player/command.c
View File

@ -2331,6 +2331,7 @@ static int mp_property_current_window_scale(void *ctx, struct m_property *prop,
return M_PROPERTY_UNAVAILABLE; return M_PROPERTY_UNAVAILABLE;
if (action == M_PROPERTY_SET) { if (action == M_PROPERTY_SET) {
// Also called by update_window_scale as a NULL property.
double scale = *(double *)arg; double scale = *(double *)arg;
int s[2] = {vid_w * scale, vid_h * scale}; int s[2] = {vid_w * scale, vid_h * scale};
if (s[0] <= 0 || s[1] <= 0) if (s[0] <= 0 || s[1] <= 0)
@ -2351,20 +2352,9 @@ static int mp_property_current_window_scale(void *ctx, struct m_property *prop,
static void update_window_scale(struct MPContext *mpctx) static void update_window_scale(struct MPContext *mpctx)
{ {
struct vo *vo = mpctx->video_out;
if (!vo)
return;
struct mp_image_params params = get_video_out_params(mpctx);
int vid_w, vid_h;
mp_image_params_get_dsize(&params, &vid_w, &vid_h);
if (vid_w < 1 || vid_h < 1)
return;
double scale = mpctx->opts->vo->window_scale; double scale = mpctx->opts->vo->window_scale;
int s[2] = {vid_w * scale, vid_h * scale}; mp_property_current_window_scale(mpctx, (struct m_property *)NULL,
if (s[0] > 0 && s[1] > 0) M_PROPERTY_SET, (void*)&scale);
vo_control(vo, VOCTRL_SET_UNFS_WINDOW_SIZE, s);
} }
static int mp_property_display_fps(void *ctx, struct m_property *prop, static int mp_property_display_fps(void *ctx, struct m_property *prop,