History

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

Showing the changes to player/javascript (1 of 3 files). Show all

Unified · Split

player/javascript/defaults.js+14−1
@@ -144,8 +144,15 @@ var async_next_id = 1; · 143 unmodified lines
144144
145145 mp.command_native_async = function command_native_async(node, cb) {
146146 var id = async_next_id++;
147+ cb = cb || function dummy() {};
148+ if (!mp._command_native_async(id, node)) {
149+ var le = mp.last_error();
150+ setTimeout(cb, 0, false, undefined, le); /* callback async */
151+ mp._set_last_error(le);
152+ return undefined;
153+ }
147154 async_callbacks[id] = cb;
148− return mp._command_native_async(id, node);
155+ return id;
149156 }
150157
151158 function async_command_handler(ev) {
@@ -157,6 +164,12 @@ function async_command_handler(ev) { · 5 unmodified lines
157164 cb(true, ev.result, "");
158165 }
159166
167+mp.abort_async_command = function abort_async_command(id) {
168+ // cb will be invoked regardless, possibly with the abort result
169+ if (async_callbacks[id])
170+ mp._abort_async_command(id);
171+}
172+
160173 /**********************************************************************
161174 * key bindings
162175 *********************************************************************/

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t