From d48dba0fe40220df9be3a2bfea90e8fc676ea539 Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Sat, 14 Aug 2010 02:41:34 +0200 Subject: [PATCH] Pass backend reference to the mixer constructor, just like for the other controllers --- mopidy/backends/base/__init__.py | 2 +- mopidy/mixers/__init__.py | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/mopidy/backends/base/__init__.py b/mopidy/backends/base/__init__.py index 3a484865..abc14c4a 100644 --- a/mopidy/backends/base/__init__.py +++ b/mopidy/backends/base/__init__.py @@ -36,7 +36,7 @@ class BaseBackend(object): if mixer is not None: self.mixer = mixer else: - self.mixer = get_class(settings.MIXER)() + self.mixer = get_class(settings.MIXER)(self) #: A :class:`multiprocessing.Queue` which can be used by e.g. library #: callbacks executing in other threads to send messages to the core diff --git a/mopidy/mixers/__init__.py b/mopidy/mixers/__init__.py index 31e5ae8e..3ef1b645 100644 --- a/mopidy/mixers/__init__.py +++ b/mopidy/mixers/__init__.py @@ -1,6 +1,11 @@ class BaseMixer(object): - def __init__(self, *args, **kwargs): - pass + """ + :param backend: a backend instance + :type mixer: :class:`mopidy.backends.base.BaseBackend` + """ + + def __init__(self, backend, *args, **kwargs): + self.backend = backend @property def volume(self):