Skip to content

player/lua: implement OSD layer in Lua #18097

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Xano-verse wants to merge 4 commits into
base: master
Choose a base branch
from
Open

player/lua: implement OSD layer in Lua #18097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6b188b8
options: add osd-lua command line option
Xano-verse May 29, 2026
f5cde36
player/lua: implement OSD layer in Lua
Xano-verse May 29, 2026
1e14332
player: integrate the Lua script into the code
Xano-verse May 29, 2026
c17c4cd
test: add tests for the Lua OSD
Xano-verse May 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions options/options.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -803,6 +803,7 @@ static const m_option_t mp_opts[] = {
{"", OPT_SUBSTRUCT(video_equalizer, mp_csp_equalizer_conf)},

{"use-filedir-conf", OPT_BOOL(use_filedir_conf)},
{"osd-lua", OPT_BOOL(lua_load_osd)},
{"osd-level", OPT_CHOICE(osd_level,
{"0", 0}, {"1", 1}, {"2", 2}, {"3", 3})},
{"osd-on-seek", OPT_CHOICE(osd_on_seek,
Expand Down Expand Up @@ -1016,6 +1017,7 @@ static const struct MPOpts mp_default_opts = {
.osd_on_seek = 1,
.osd_duration = 1000,
#if HAVE_LUA
.lua_load_osd = false,
.lua_load_osc = true,
.lua_load_ytdl = true,
.lua_ytdl_format = NULL,
Expand Down
1 change: 1 addition & 0 deletions options/options.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ typedef struct MPOpts {
char **script_files;
char **script_opts;
bool js_memory_report;
bool lua_load_osd;
bool lua_load_osc;
bool lua_load_ytdl;
char *lua_ytdl_format;
Expand Down
2 changes: 1 addition & 1 deletion player/core.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@ typedef struct MPContext {

struct mp_ipc_ctx *ipc_ctx;

int64_t builtin_script_ids[9];
int64_t builtin_script_ids[10];

mp_mutex abort_lock;

Expand Down
3 changes: 3 additions & 0 deletions player/lua.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@ static const char * const builtin_lua_scripts[][2] = {
},
{"mp.options",
# include "player/lua/options.lua.inc"
},
{"@osd.lua",
# include "player/lua/osd.lua.inc"
},
{"@osc.lua",
# include "player/lua/osc.lua.inc"
Expand Down
2 changes: 1 addition & 1 deletion player/lua/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
lua_files = ['defaults.lua', 'assdraw.lua', 'options.lua', 'osc.lua',
lua_files = ['defaults.lua', 'assdraw.lua', 'options.lua', 'osd.lua', 'osc.lua',
'ytdl_hook.lua', 'stats.lua', 'console.lua', 'auto_profiles.lua',
'input.lua', 'fzy.lua', 'select.lua', 'positioning.lua',
'commands.lua', 'context_menu.lua']
Expand Down
Loading
Loading