js: expose mpv_abort_async_command() (match dbe831bd)

With minor difference from lua, as documented.

Avi Halachmi (:avih) committed 7 years ago

Commit 44f8dcc1 parent ad0a5253 files · +26 −3Browse files

Unified · Split

3 files

@@ -96,8 +96,10 @@ Where the Lua APIs use ``nil`` to indicate error, JS APIs use ``undefined``. · 95 unmodified lines
96		96
97	``mp.command_native(table [,def])`` (LE)	97	``mp.command_native(table [,def])`` (LE)
98		98
99	``mp.command_native_async(table [,fn])`` (LE) Note: ``error`` is empty string on	99	``id = mp.command_native_async(table [,fn])`` (LE) Notes: ``id`` is true-thy on
100	success.	100	success, ``fn`` is called always a-sync, ``error`` is empty string on success.
		101
		102	``mp.abort_async_command(id)``
101		103
102	``mp.get_property(name [,def])`` (LE)	104	``mp.get_property(name [,def])`` (LE)
103		105

     push_status(J, mpv_command_node_async(jclient(J), id, &node));
 }
+// args: async-command-id
+static void script__abort_async_command(js_State *J)
+{
+    mpv_abort_async_command(jclient(J), jsL_checkuint64(J, 1));
+    push_success(J);
+}
 // args: none, result in millisec
 static void script_get_time_ms(js_State *J)
 {
     FN_ENTRY(commandv, 0),
     AF_ENTRY(command_native, 2),
     AF_ENTRY(_command_native_async, 2),
+    FN_ENTRY(_abort_async_command, 1),
     FN_ENTRY(get_property_bool, 2),
     FN_ENTRY(get_property_number, 2),
     AF_ENTRY(get_property_native, 2),

 mp.command_native_async = function command_native_async(node, cb) {
     var id = async_next_id++;
+    cb = cb || function dummy() {};
+    if (!mp._command_native_async(id, node)) {
+        var le = mp.last_error();
+        setTimeout(cb, 0, false, undefined, le);  /* callback async */
+        mp._set_last_error(le);
+        return undefined;
+    }
     async_callbacks[id] = cb;
-    return mp._command_native_async(id, node);
+    return id;
 }
 function async_command_handler(ev) {
         cb(true, ev.result, "");
 }
+mp.abort_async_command = function abort_async_command(id) {
+    // cb will be invoked regardless, possibly with the abort result
+    if (async_callbacks[id])
+        mp._abort_async_command(id);
+}
 /**********************************************************************
  *  key bindings
  *********************************************************************/

Keyboard shortcuts