path: root/sub/osd_dummy.c
diff options
authorwm4 <wm4@nowhere>2019-12-23 11:40:27 +0100
committerwm4 <wm4@nowhere>2019-12-23 11:44:24 +0100
commit07287262513c0d1ea46b7beaf100e73f2008295f (patch)
tree01548db64854e14caf2f0985fde8696488e57247 /sub/osd_dummy.c
parent96932fe77c912f86d8fc51e073b4fd26a124a1fb (diff)
client API, lua: add new API for setting OSD overlays
Lua scripting has an undocumented mp.set_osd_ass() function, which is used by osc.lua and console.lua. Apparently, 3rd party scripts also use this. It's probably time to make this a public API. The Lua implementation just bypassed the libmpv API. To make it usable by any type of client, turn it into a command, "osd-overlay". There's already a "overlay-add". Ignore it (although the manpage admits guiltiness). I don't really want to deal with that old command. Its main problem is that it uses global IDs, while I'd like to avoid that scripts mess with each others overlays (whether that is accidentally or intentionally). Maybe "overlay-add" can eventually be merged into "osd-overlay", but I'm too lazy to do that now. Scripting now uses the commands. There is a helper to manage OSD overlays. The helper is very "thin"; I only want to force script authors to use the ID allocation, which may help with putting multiple scripts into a single .lua file without causing conflicts (basically, avoiding singletons within a script's environment). The old set_osd_ass() is emulated with the new API. The JS scripting wrapper also provides a set_osd_ass() function, which calls internal mpv API. Comment that part (to keep it compiling), but I'm leaving it to @avih to finish the change.
Diffstat (limited to 'sub/osd_dummy.c')
1 files changed, 5 insertions, 2 deletions
diff --git a/sub/osd_dummy.c b/sub/osd_dummy.c
index 0e6b802cef..db032ec5b1 100644
--- a/sub/osd_dummy.c
+++ b/sub/osd_dummy.c
@@ -24,8 +24,11 @@ void osd_object_get_bitmaps(struct osd_state *osd, struct osd_object *obj,
*out_imgs = (struct sub_bitmaps) {0};
-void osd_set_external(struct osd_state *osd, void *id, int res_x, int res_y,
- char *text)
+void osd_set_external(struct osd_state *osd, struct osd_external_ass *ov)
+void osd_set_external_remove_owner(struct osd_state *osd, void *owner)