From d75ca5b4e8dce13ece6238bcf5b082a29ca65581 Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Mon, 7 Mar 2011 22:42:55 +0100
Subject: [PATCH] Make MpdFrontend start

---
 mopidy/frontends/mpd/__init__.py | 2 +-
 mopidy/frontends/mpd/server.py   | 6 ++----
 mopidy/frontends/mpd/session.py  | 4 +---
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/mopidy/frontends/mpd/__init__.py b/mopidy/frontends/mpd/__init__.py
index b3d5b5e8..f4684b9d 100644
--- a/mopidy/frontends/mpd/__init__.py
+++ b/mopidy/frontends/mpd/__init__.py
@@ -37,6 +37,6 @@ class MpdThread(BaseThread):
 
     def run_inside_try(self):
         logger.debug(u'Starting MPD server thread')
-        server = MpdServer(self.core_queue)
+        server = MpdServer()
         server.start()
         asyncore.loop()
diff --git a/mopidy/frontends/mpd/server.py b/mopidy/frontends/mpd/server.py
index 7caf21f9..231bdf40 100644
--- a/mopidy/frontends/mpd/server.py
+++ b/mopidy/frontends/mpd/server.py
@@ -15,9 +15,8 @@ class MpdServer(asyncore.dispatcher):
     for each client connection.
     """
 
-    def __init__(self, core_queue):
+    def __init__(self):
         asyncore.dispatcher.__init__(self)
-        self.core_queue = core_queue
 
     def start(self):
         """Start MPD server."""
@@ -47,8 +46,7 @@ class MpdServer(asyncore.dispatcher):
         (client_socket, client_socket_address) = self.accept()
         logger.info(u'MPD client connection from [%s]:%s',
             client_socket_address[0], client_socket_address[1])
-        MpdSession(self, client_socket, client_socket_address,
-            self.core_queue).start()
+        MpdSession(self, client_socket, client_socket_address).start()
 
     def handle_close(self):
         """Handle end of client connection."""
diff --git a/mopidy/frontends/mpd/session.py b/mopidy/frontends/mpd/session.py
index 349fceb9..399c2adb 100644
--- a/mopidy/frontends/mpd/session.py
+++ b/mopidy/frontends/mpd/session.py
@@ -14,13 +14,11 @@ class MpdSession(asynchat.async_chat):
     MPD requests to the dispatcher.
     """
 
-    def __init__(self, server, client_socket, client_socket_address,
-            core_queue):
+    def __init__(self, server, client_socket, client_socket_address):
         asynchat.async_chat.__init__(self, sock=client_socket)
         self.server = server
         self.client_address = client_socket_address[0]
         self.client_port = client_socket_address[1]
-        self.core_queue = core_queue
         self.input_buffer = []
         self.authenticated = False
         self.set_terminator(LINE_TERMINATOR.encode(ENCODING))