From 76376d9040a0aa217077015573a83f4b338e039d Mon Sep 17 00:00:00 2001
From: Damien Elmes <git@ichi2.net>
Date: Sat, 26 Sep 2009 23:05:30 +0900
Subject: [PATCH] move the simple player code into a plugin

---
 anki/sound.py | 41 ++---------------------------------------
 1 file changed, 2 insertions(+), 39 deletions(-)

diff --git a/anki/sound.py b/anki/sound.py
index c39cc2b62..98028b649 100644
--- a/anki/sound.py
+++ b/anki/sound.py
@@ -228,38 +228,6 @@ def stopMplayerOnce():
 
 addHook("deckClosed", stopMplayerOnce)
 
-# Simple player
-##########################################################################
-
-externalManager = None
-
-class QueueMonitor(threading.Thread):
-
-    def run(self):
-        while 1:
-            if queue:
-                path = queue.pop(0)
-                try:
-                    retryWait(subprocess.Popen(
-                        mplayerCmd + [path], startupinfo=si))
-                except OSError:
-                    raise Exception("Audio player not found")
-            else:
-                return
-            time.sleep(0.1)
-
-def queueExternal(path):
-    global externalManager
-    path = path.encode(sys.getfilesystemencoding())
-    queue.append(path)
-    if not externalManager or not externalManager.isAlive():
-        externalManager = QueueMonitor()
-        externalManager.start()
-
-def clearExternalQueue():
-    global queue
-    queue = []
-
 # PyAudio recording
 ##########################################################################
 
@@ -359,13 +327,8 @@ class PyAudioRecorder(_Recorder):
 # Audio interface
 ##########################################################################
 
-if sys.platform.startswith("darwin") and platform.mac_ver()[0] < "10.4":
-    # fall back to primitive player
-    _player = queueExternal
-    _queueEraser = clearExternalQueue
-else:
-    _player = queueMplayer
-    _queueEraser = clearMplayerQueue
+_player = queueMplayer
+_queueEraser = clearMplayerQueue
 
 def play(path):
     _player(path)