From a05212251bec02740b651eaf9849e190ebd1546e Mon Sep 17 00:00:00 2001
From: Thomas Adamcik <adamcik@samfundet.no>
Date: Fri, 13 Aug 2010 22:48:51 +0200
Subject: [PATCH] Pass output, backend and frontend classes into coreprocess to
 so that import errors are handeled better

---
 mopidy/__main__.py |  5 ++++-
 mopidy/process.py  | 14 ++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/mopidy/__main__.py b/mopidy/__main__.py
index 7c62033b..c92ce1ed 100644
--- a/mopidy/__main__.py
+++ b/mopidy/__main__.py
@@ -22,7 +22,10 @@ def main():
     get_or_create_folder('~/.mopidy/')
     core_queue = multiprocessing.Queue()
     get_class(settings.SERVER)(core_queue).start()
-    core = CoreProcess(core_queue)
+    output_class = get_class(settings.OUTPUT)
+    backend_class = get_class(settings.BACKENDS[0])
+    frontend_class = get_class(settings.FRONTEND)
+    core = CoreProcess(core_queue, output_class, backend_class, frontend_class)
     core.start()
     asyncore.loop()
 
diff --git a/mopidy/process.py b/mopidy/process.py
index 79638515..b1cdc8af 100644
--- a/mopidy/process.py
+++ b/mopidy/process.py
@@ -37,10 +37,14 @@ class BaseProcess(multiprocessing.Process):
 
 
 class CoreProcess(BaseProcess):
-    def __init__(self, core_queue):
+    def __init__(self, core_queue, output_class, backend_class,
+            frontend_class):
         super(CoreProcess, self).__init__()
         self.core_queue = core_queue
         self.output_queue = None
+        self.output_class = output_class
+        self.backend_class = backend_class
+        self.frontend_class = frontend_class
         self.output = None
         self.backend = None
         self.frontend = None
@@ -53,11 +57,9 @@ class CoreProcess(BaseProcess):
 
     def setup(self):
         self.output_queue = multiprocessing.Queue()
-        self.output = get_class(settings.OUTPUT)(self.core_queue,
-            self.output_queue)
-        self.backend = get_class(settings.BACKENDS[0])(self.core_queue,
-            self.output_queue)
-        self.frontend = get_class(settings.FRONTEND)(self.backend)
+        self.output = self.output_class(self.core_queue, self.output_queue)
+        self.backend = self.backend_class(self.core_queue, self.output_queue)
+        self.frontend = self.frontend_class(self.backend)
 
     def process_message(self, message):
         if message.get('to') == 'output':