From a94020e25bc5fc50ac0cea132a4cccb7743e85fa Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Tue, 8 Apr 2014 21:10:00 +0200
Subject: lua: add API for observing property changes

A low level API was added already earlier, but that was merely a binding
for the raw C API. Add a "proper" one, and document it.
---
 player/lua.c            | 16 ++++++++++++----
 player/lua/defaults.lua | 26 ++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 4 deletions(-)

(limited to 'player')

diff --git a/player/lua.c b/player/lua.c
index 6c17bc4d60..e9065d488b 100644
--- a/player/lua.c
+++ b/player/lua.c
@@ -432,6 +432,11 @@ static int script_wait_event(lua_State *L)
     lua_pushstring(L, mpv_event_name(event->event_id)); // event name
     lua_setfield(L, -2, "event"); // event
 
+    if (event->reply_userdata) {
+        lua_pushnumber(L, event->reply_userdata);
+        lua_setfield(L, -2, "id");
+    }
+
     if (event->error < 0) {
         lua_pushstring(L, mpv_error_string(event->error)); // event err
         lua_setfield(L, -2, "error"); // event
@@ -880,6 +885,8 @@ static int script_get_property_native(lua_State *L)
 
 static mpv_format check_property_format(lua_State *L, int arg)
 {
+    if (lua_isnil(L, arg))
+        return MPV_FORMAT_NONE;
     const char *fmts[] = {"none", "native", "bool", "string", "number", NULL};
     switch (luaL_checkoption(L, arg, "none", fmts)) {
     case 0: return MPV_FORMAT_NONE;
@@ -891,7 +898,8 @@ static mpv_format check_property_format(lua_State *L, int arg)
     abort();
 }
 
-static int script_observe_property(lua_State *L)
+// It has a raw_ prefix, because there is a more high level API in defaults.lua.
+static int script_raw_observe_property(lua_State *L)
 {
     struct script_ctx *ctx = get_ctx(L);
     uint64_t id = luaL_checknumber(L, 1);
@@ -900,7 +908,7 @@ static int script_observe_property(lua_State *L)
     return check_error(L, mpv_observe_property(ctx->client, id, name, format));
 }
 
-static int script_unobserve_property(lua_State *L)
+static int script_raw_unobserve_property(lua_State *L)
 {
     struct script_ctx *ctx = get_ctx(L);
     uint64_t id = luaL_checknumber(L, 1);
@@ -1063,8 +1071,8 @@ static struct fn_entry fn_list[] = {
     FN_ENTRY(set_property_bool),
     FN_ENTRY(set_property_number),
     FN_ENTRY(set_property_native),
-    FN_ENTRY(observe_property),
-    FN_ENTRY(unobserve_property),
+    FN_ENTRY(raw_observe_property),
+    FN_ENTRY(raw_unobserve_property),
     FN_ENTRY(property_list),
     FN_ENTRY(set_osd_ass),
     FN_ENTRY(get_osd_resolution),
diff --git a/player/lua/defaults.lua b/player/lua/defaults.lua
index 512fe0cb54..80630d20b6 100644
--- a/player/lua/defaults.lua
+++ b/player/lua/defaults.lua
@@ -241,6 +241,31 @@ local function message_dispatch(ev)
     end
 end
 
+local property_id = 0
+local properties = {}
+
+function mp.observe_property(name, t, cb)
+    local id = property_id + 1
+    property_id = id
+    properties[id] = cb
+    mp.raw_observe_property(id, name, t)
+end
+
+function mp.unobserve_property(cb)
+    for prop_id, prop_cb in pairs(properties) do
+        if cb == prop_cb then
+            properties[prop_id] = nil
+        end
+    end
+end
+
+local function property_change(ev)
+    local prop = properties[ev.id]
+    if prop then
+        prop(ev.name, ev.data)
+    end
+end
+
 -- used by default event loop (mp_event_loop()) to decide when to quit
 mp.keep_running = true
 
@@ -286,6 +311,7 @@ end
 mp.register_event("shutdown", function() mp.keep_running = false end)
 mp.register_event("script-input-dispatch", script_dispatch)
 mp.register_event("client-message", message_dispatch)
+mp.register_event("property-change", property_change)
 
 mp.msg = {
     log = mp.log,
-- 
cgit v1.2.3