summaryrefslogtreecommitdiffstats
path: root/player/javascript
diff options
context:
space:
mode:
authorAvi Halachmi (:avih) <avihpit@yahoo.com>2019-03-12 11:35:55 +0200
committerAvi Halachmi (:avih) <avihpit@yahoo.com>2019-09-11 21:08:04 +0300
commit44f8dccfb6054b08803101ab34dffd9cc8a6245f (patch)
tree994b04cf4ff106c23b76d7727938c3a3cd9bee3f /player/javascript
parentad0a525f20f7dfc31f37f31d6f898963ef1d23c6 (diff)
downloadmpv-44f8dccfb6054b08803101ab34dffd9cc8a6245f.tar.bz2
mpv-44f8dccfb6054b08803101ab34dffd9cc8a6245f.tar.xz
js: expose mpv_abort_async_command() (match dbe831bd)
With minor difference from lua, as documented.
Diffstat (limited to 'player/javascript')
-rw-r--r--player/javascript/defaults.js15
1 files changed, 14 insertions, 1 deletions
diff --git a/player/javascript/defaults.js b/player/javascript/defaults.js
index cc7fe04497..c91228087d 100644
--- a/player/javascript/defaults.js
+++ b/player/javascript/defaults.js
@@ -144,8 +144,15 @@ var async_next_id = 1;
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) {
@@ -157,6 +164,12 @@ 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
*********************************************************************/