GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-22 16:02:23 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

mpv.py fixes

Browse source 
- enable input keys for video seeking
- output debug info to stdout so it's not caught by anki's error handler
- before sending a command, check the process is still alive, and
restart if necessary - otherwise a user who closes a video window will
end up with errors
This commit is contained in:
Damien Elmes 2017-09-30 17:24:34 +10:00
parent e7d9d1264d
commit bb661a4b7d
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
anki/mpv.py
View file

@ -64,7 +64,6 @@ class MPVBase:
default_argv = [ default_argv = [
"--idle", "--idle",
"--no-input-default-bindings",
"--no-terminal" "--no-terminal"
] ]
@ -193,7 +192,7 @@ class MPVBase:
buf = buf[newline + 1:] buf = buf[newline + 1:]
if self.debug: if self.debug:
sys.stderr.write("<<< " + data.decode("utf8", "replace")) sys.stdout.write("<<< " + data.decode("utf8", "replace"))
message = self._parse_message(data) message = self._parse_message(data)
self._handle_message(message) self._handle_message(message)
@ -245,7 +244,7 @@ class MPVBase:
data = self._compose_message(message) data = self._compose_message(message)
if self.debug: if self.debug:
sys.stderr.write(">>> " + data.decode("utf8", "replace")) sys.stdout.write(">>> " + data.decode("utf8", "replace"))
# Request/response cycles are coordinated across different threads, so # Request/response cycles are coordinated across different threads, so
# that they don't get mixed up. This makes it possible to use commands # that they don't get mixed up. This makes it possible to use commands
@ -299,6 +298,7 @@ class MPVBase:
def _send_request(self, message, timeout=None): def _send_request(self, message, timeout=None):
"""Send a command to the mpv process and collect the result. """Send a command to the mpv process and collect the result.
""" """
self.ensure_running()
self._send_message(message, timeout) self._send_message(message, timeout)
try: try:
return self._get_response(timeout) return self._get_response(timeout)
@ -313,6 +313,18 @@ class MPVBase:
""" """
return self._proc.poll() is None return self._proc.poll() is None
def ensure_running(self):
if not self.is_running():
self._stop_thread()
self._stop_process()
self._stop_socket()
self._prepare_socket()
self._prepare_process()
self._start_process()
self._start_socket()
self._prepare_thread()
self._start_thread()
def close(self): def close(self):
"""Shutdown the mpv process and our communication setup. """Shutdown the mpv process and our communication setup.
""" """