diff --git a/mopidy/backends/base/__init__.py b/mopidy/backends/base/__init__.py index abc14c4a..7a178160 100644 --- a/mopidy/backends/base/__init__.py +++ b/mopidy/backends/base/__init__.py @@ -25,18 +25,18 @@ class BaseBackend(object): :type core_queue: :class:`multiprocessing.Queue` :param output_queue: a queue for sending messages to the output process :type output_queue: :class:`multiprocessing.Queue` - :param mixer: either a mixer instance, or :class:`None` to use the mixer + :param mixer_class: either a mixer class, or :class:`None` to use the mixer defined in settings - :type mixer: :class:`mopidy.mixers.BaseMixer` or :class:`None` + :type mixer_class: a subclass of :class:`mopidy.mixers.BaseMixer` or + :class:`None` """ - def __init__(self, core_queue=None, output_queue=None, mixer=None): + def __init__(self, core_queue=None, output_queue=None, mixer_class=None): self.core_queue = core_queue self.output_queue = output_queue - if mixer is not None: - self.mixer = mixer - else: - self.mixer = get_class(settings.MIXER)(self) + if mixer_class is None: + mixer_class = get_class(settings.MIXER) + self.mixer = mixer_class(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/tests/backends/base.py b/tests/backends/base.py index 416c1799..64ca7797 100644 --- a/tests/backends/base.py +++ b/tests/backends/base.py @@ -32,7 +32,7 @@ class BaseCurrentPlaylistControllerTest(object): backend_class = None def setUp(self): - self.backend = self.backend_class(mixer=DummyMixer()) + self.backend = self.backend_class(mixer_class=DummyMixer) self.controller = self.backend.current_playlist self.playback = self.backend.playback @@ -281,7 +281,7 @@ class BasePlaybackControllerTest(object): backend_class = None def setUp(self): - self.backend = self.backend_class(mixer=DummyMixer()) + self.backend = self.backend_class(mixer_class=DummyMixer) self.playback = self.backend.playback self.current_playlist = self.backend.current_playlist @@ -933,7 +933,7 @@ class BaseStoredPlaylistsControllerTest(object): settings.LOCAL_TAG_CACHE = data_folder('library_tag_cache') settings.LOCAL_MUSIC_FOLDER = data_folder('') - self.backend = self.backend_class(mixer=DummyMixer()) + self.backend = self.backend_class(mixer_class=DummyMixer) self.stored = self.backend.stored_playlists def tearDown(self): @@ -1055,7 +1055,7 @@ class BaseLibraryControllerTest(object): Track()] def setUp(self): - self.backend = self.backend_class(mixer=DummyMixer()) + self.backend = self.backend_class(mixer_class=DummyMixer) self.library = self.backend.library def tearDown(self): diff --git a/tests/backends/local_test.py b/tests/backends/local_test.py index 63282bde..23a12bca 100644 --- a/tests/backends/local_test.py +++ b/tests/backends/local_test.py @@ -116,7 +116,7 @@ class LocalStoredPlaylistsControllerTest(BaseStoredPlaylistsControllerTest, self.stored.save(playlist) self.backend.destroy() - self.backend = self.backend_class(mixer=DummyMixer()) + self.backend = self.backend_class(mixer_class=DummyMixer) self.stored = self.backend.stored_playlists self.assert_(self.stored.playlists) diff --git a/tests/frontends/mpd/audio_output_test.py b/tests/frontends/mpd/audio_output_test.py index c752f40e..24201341 100644 --- a/tests/frontends/mpd/audio_output_test.py +++ b/tests/frontends/mpd/audio_output_test.py @@ -6,8 +6,7 @@ from mopidy.mixers.dummy import DummyMixer class AudioOutputHandlerTest(unittest.TestCase): def setUp(self): - self.m = DummyMixer() - self.b = DummyBackend(mixer=self.m) + self.b = DummyBackend(mixer_class=DummyMixer) self.h = frontend.MpdFrontend(backend=self.b) def test_enableoutput(self): diff --git a/tests/frontends/mpd/command_list_test.py b/tests/frontends/mpd/command_list_test.py index eed92a24..683a1013 100644 --- a/tests/frontends/mpd/command_list_test.py +++ b/tests/frontends/mpd/command_list_test.py @@ -6,8 +6,7 @@ from mopidy.mixers.dummy import DummyMixer class CommandListsTest(unittest.TestCase): def setUp(self): - self.m = DummyMixer() - self.b = DummyBackend(mixer=self.m) + self.b = DummyBackend(mixer_class=DummyMixer) self.h = frontend.MpdFrontend(backend=self.b) def test_command_list_begin(self): diff --git a/tests/frontends/mpd/connection_test.py b/tests/frontends/mpd/connection_test.py index 83133050..341e630c 100644 --- a/tests/frontends/mpd/connection_test.py +++ b/tests/frontends/mpd/connection_test.py @@ -6,8 +6,7 @@ from mopidy.mixers.dummy import DummyMixer class ConnectionHandlerTest(unittest.TestCase): def setUp(self): - self.m = DummyMixer() - self.b = DummyBackend(mixer=self.m) + self.b = DummyBackend(mixer_class=DummyMixer) self.h = frontend.MpdFrontend(backend=self.b) def test_close(self): diff --git a/tests/frontends/mpd/current_playlist_test.py b/tests/frontends/mpd/current_playlist_test.py index 0d639f89..e42077df 100644 --- a/tests/frontends/mpd/current_playlist_test.py +++ b/tests/frontends/mpd/current_playlist_test.py @@ -7,8 +7,7 @@ from mopidy.models import Track class CurrentPlaylistHandlerTest(unittest.TestCase): def setUp(self): - self.m = DummyMixer() - self.b = DummyBackend(mixer=self.m) + self.b = DummyBackend(mixer_class=DummyMixer) self.h = frontend.MpdFrontend(backend=self.b) def test_add(self): diff --git a/tests/frontends/mpd/music_db_test.py b/tests/frontends/mpd/music_db_test.py index 62915a58..fc8f980a 100644 --- a/tests/frontends/mpd/music_db_test.py +++ b/tests/frontends/mpd/music_db_test.py @@ -6,8 +6,7 @@ from mopidy.mixers.dummy import DummyMixer class MusicDatabaseHandlerTest(unittest.TestCase): def setUp(self): - self.m = DummyMixer() - self.b = DummyBackend(mixer=self.m) + self.b = DummyBackend(mixer_class=DummyMixer) self.h = frontend.MpdFrontend(backend=self.b) def test_count(self): diff --git a/tests/frontends/mpd/playback_test.py b/tests/frontends/mpd/playback_test.py index 3cf0a11f..1cc3bc00 100644 --- a/tests/frontends/mpd/playback_test.py +++ b/tests/frontends/mpd/playback_test.py @@ -7,8 +7,7 @@ from mopidy.models import Track class PlaybackOptionsHandlerTest(unittest.TestCase): def setUp(self): - self.m = DummyMixer() - self.b = DummyBackend(mixer=self.m) + self.b = DummyBackend(mixer_class=DummyMixer) self.h = frontend.MpdFrontend(backend=self.b) def test_consume_off(self): @@ -167,8 +166,7 @@ class PlaybackOptionsHandlerTest(unittest.TestCase): class PlaybackControlHandlerTest(unittest.TestCase): def setUp(self): - self.m = DummyMixer() - self.b = DummyBackend(mixer=self.m) + self.b = DummyBackend(mixer_class=DummyMixer) self.h = frontend.MpdFrontend(backend=self.b) def test_next(self): diff --git a/tests/frontends/mpd/reflection_test.py b/tests/frontends/mpd/reflection_test.py index 11bd5ba9..5491946c 100644 --- a/tests/frontends/mpd/reflection_test.py +++ b/tests/frontends/mpd/reflection_test.py @@ -6,8 +6,7 @@ from mopidy.mixers.dummy import DummyMixer class ReflectionHandlerTest(unittest.TestCase): def setUp(self): - self.m = DummyMixer() - self.b = DummyBackend(mixer=self.m) + self.b = DummyBackend(mixer_class=DummyMixer) self.h = frontend.MpdFrontend(backend=self.b) def test_commands_returns_list_of_all_commands(self): diff --git a/tests/frontends/mpd/request_handler_test.py b/tests/frontends/mpd/request_handler_test.py index beea4bc3..ac8bd7e9 100644 --- a/tests/frontends/mpd/request_handler_test.py +++ b/tests/frontends/mpd/request_handler_test.py @@ -6,8 +6,7 @@ from mopidy.mixers.dummy import DummyMixer class RequestHandlerTest(unittest.TestCase): def setUp(self): - self.m = DummyMixer() - self.b = DummyBackend(mixer=self.m) + self.b = DummyBackend(mixer_class=DummyMixer) self.h = frontend.MpdFrontend(backend=self.b) def test_register_same_pattern_twice_fails(self): diff --git a/tests/frontends/mpd/status_test.py b/tests/frontends/mpd/status_test.py index 8be549d6..907788f5 100644 --- a/tests/frontends/mpd/status_test.py +++ b/tests/frontends/mpd/status_test.py @@ -7,8 +7,7 @@ from mopidy.models import Track class StatusHandlerTest(unittest.TestCase): def setUp(self): - self.m = DummyMixer() - self.b = DummyBackend(mixer=self.m) + self.b = DummyBackend(mixer_class=DummyMixer) self.h = frontend.MpdFrontend(backend=self.b) def test_clearerror(self): diff --git a/tests/frontends/mpd/stickers_test.py b/tests/frontends/mpd/stickers_test.py index 83bbdd04..401eaf57 100644 --- a/tests/frontends/mpd/stickers_test.py +++ b/tests/frontends/mpd/stickers_test.py @@ -6,8 +6,7 @@ from mopidy.mixers.dummy import DummyMixer class StickersHandlerTest(unittest.TestCase): def setUp(self): - self.m = DummyMixer() - self.b = DummyBackend(mixer=self.m) + self.b = DummyBackend(mixer_class=DummyMixer) self.h = frontend.MpdFrontend(backend=self.b) def test_sticker_get(self): diff --git a/tests/frontends/mpd/stored_playlists_test.py b/tests/frontends/mpd/stored_playlists_test.py index 179e0802..9babc670 100644 --- a/tests/frontends/mpd/stored_playlists_test.py +++ b/tests/frontends/mpd/stored_playlists_test.py @@ -10,8 +10,7 @@ from tests import SkipTest class StoredPlaylistsHandlerTest(unittest.TestCase): def setUp(self): - self.m = DummyMixer() - self.b = DummyBackend(mixer=self.m) + self.b = DummyBackend(mixer_class=DummyMixer) self.h = frontend.MpdFrontend(backend=self.b) def test_listplaylist(self): diff --git a/tests/mixers/base_test.py b/tests/mixers/base_test.py index 0659a12e..292edcda 100644 --- a/tests/mixers/base_test.py +++ b/tests/mixers/base_test.py @@ -12,7 +12,7 @@ class BaseMixerTest(unittest.TestCase): INITIAL = None def setUp(self): - self.mixer = DummyMixer() + self.mixer = DummyMixer(None) def test_initial_volume(self): self.assertEqual(self.mixer.volume, self.INITIAL) diff --git a/tests/mixers/denon_test.py b/tests/mixers/denon_test.py index bf387418..e0f59705 100644 --- a/tests/mixers/denon_test.py +++ b/tests/mixers/denon_test.py @@ -29,7 +29,7 @@ class DenonMixerTest(BaseMixerTest): def setUp(self): self.device = DenonMixerDeviceMock() - self.mixer = DenonMixer(device=self.device) + self.mixer = DenonMixer(None, device=self.device) def test_reopen_device(self): self.device._open = False