From 194f0e543edb1598b88f9f20562a92c52a5f0122 Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Fri, 19 Mar 2010 22:05:43 +0100
Subject: [PATCH] Move mixer initialization from main() into backend

---
 mopidy/__main__.py          | 4 +---
 mopidy/backends/__init__.py | 5 +++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/mopidy/__main__.py b/mopidy/__main__.py
index 111c0b5e..07f571ce 100644
--- a/mopidy/__main__.py
+++ b/mopidy/__main__.py
@@ -18,12 +18,10 @@ def main():
     # ---------------------------
     #
     # TODO Init backend in new Process (named core?)
-    # TODO Init mixer from backend
     # TODO Init MpdHandler from backend/core
     # TODO Init MpdServer in MainThread or in new Process?
 
-    mixer = get_class(settings.MIXER)()
-    backend = get_class(settings.BACKENDS[0])(mixer=mixer)
+    backend = get_class(settings.BACKENDS[0])()
     MpdServer(backend=backend)
     asyncore.loop()
 
diff --git a/mopidy/backends/__init__.py b/mopidy/backends/__init__.py
index 93b74498..280458a4 100644
--- a/mopidy/backends/__init__.py
+++ b/mopidy/backends/__init__.py
@@ -3,13 +3,14 @@ import logging
 import random
 import time
 
+from mopidy import get_class, settings
 from mopidy.models import Playlist
 
 logger = logging.getLogger('backends.base')
 
 class BaseBackend(object):
-    def __init__(self, mixer=None):
-        self.mixer = mixer
+    def __init__(self):
+        self.mixer = get_class(settings.MIXER)()
 
     #: The current playlist controller. An instance of
     #: :class:`BaseCurrentPlaylistController`.