From 876a3bafc5a0cb491ee1f1d5e928cd6e6ef530a8 Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 8 Mar 2016 21:54:17 +0100 Subject: osd: cleanup: make OSDTYPE_ constants private to OSD code No need to have them everywhere. The only exception/annoyance is MAX_OSD_PARTS, which is now basically duplicated (and at runtime initialization is checked with an assert()). --- player/lua.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'player/lua.c') diff --git a/player/lua.c b/player/lua.c index 680577554c..84d7295640 100644 --- a/player/lua.c +++ b/player/lua.c @@ -978,7 +978,7 @@ static int script_set_osd_ass(lua_State *L) static int script_get_osd_size(lua_State *L) { struct MPContext *mpctx = get_mpctx(L); - struct mp_osd_res vo_res = osd_get_vo_res(mpctx->osd, OSDTYPE_EXTERNAL); + struct mp_osd_res vo_res = osd_get_vo_res(mpctx->osd); double aspect = 1.0 * vo_res.w / MPMAX(vo_res.h, 1) / (vo_res.display_par ? vo_res.display_par : 1); lua_pushnumber(L, vo_res.w); @@ -990,7 +990,7 @@ static int script_get_osd_size(lua_State *L) static int script_get_osd_margins(lua_State *L) { struct MPContext *mpctx = get_mpctx(L); - struct mp_osd_res vo_res = osd_get_vo_res(mpctx->osd, OSDTYPE_EXTERNAL); + struct mp_osd_res vo_res = osd_get_vo_res(mpctx->osd); lua_pushnumber(L, vo_res.ml); lua_pushnumber(L, vo_res.mt); lua_pushnumber(L, vo_res.mr); -- cgit v1.2.3