From ca95552408237744281744cc241f80a84ee89d51 Mon Sep 17 00:00:00 2001
From: Damien Elmes <git@ichi2.net>
Date: Mon, 2 Oct 2017 16:37:52 +1000
Subject: [PATCH] integrate _packagedCmd() into mpv for binary distrib

---
 anki/mpv.py   | 3 ++-
 anki/sound.py | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/anki/mpv.py b/anki/mpv.py
index e1d8b2357..c81dda122 100644
--- a/anki/mpv.py
+++ b/anki/mpv.py
@@ -64,6 +64,7 @@ class MPVBase:
     """
 
     executable = find_executable("mpv")
+    popenEnv = None
 
     default_argv = [
         "--idle",
@@ -106,7 +107,7 @@ class MPVBase:
     def _start_process(self):
         """Start the mpv process.
         """
-        self._proc = subprocess.Popen(self.argv)
+        self._proc = subprocess.Popen(self.argv, env=self.popenEnv)
 
     def _stop_process(self):
         """Stop the mpv process.
diff --git a/anki/sound.py b/anki/sound.py
index b55501288..69f8b0208 100644
--- a/anki/sound.py
+++ b/anki/sound.py
@@ -80,7 +80,13 @@ def retryWait(proc):
 
 from anki.mpv import MPV
 
+mpvPath, mpvEnv = _packagedCmd(["mpv"])
+
 class MpvManager(MPV):
+
+    executable = mpvPath[0]
+    popenEnv = mpvEnv
+
     def __init__(self):
         super().__init__(window_id=None, debug=False)