From 6d6bc4b808b2a57cff43443c2a5a7da48b5184e8 Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Tue, 8 Jul 2014 01:01:55 +0200 Subject: [PATCH] core: Use new mixer API --- mopidy/commands.py | 6 +++--- mopidy/core/actor.py | 4 ++-- mopidy/core/playback.py | 20 ++++++++++---------- tests/core/test_actor.py | 4 ++-- tests/core/test_library.py | 2 +- tests/core/test_playback.py | 2 +- tests/core/test_playlists.py | 2 +- tests/core/test_tracklist.py | 2 +- tests/local/test_tracklist.py | 2 +- 9 files changed, 22 insertions(+), 22 deletions(-) diff --git a/mopidy/commands.py b/mopidy/commands.py index 7e66753f..514407b6 100644 --- a/mopidy/commands.py +++ b/mopidy/commands.py @@ -269,7 +269,7 @@ class RootCommand(Command): audio = self.start_audio(config) mixer = self.start_mixer(config, audio, mixer_classes) backends = self.start_backends(config, backend_classes, audio) - core = self.start_core(audio, mixer, backends) + core = self.start_core(mixer, backends) self.start_frontends(config, frontend_classes, core) loop.run() except KeyboardInterrupt: @@ -316,9 +316,9 @@ class RootCommand(Command): logger.info('Starting Mopidy mixer: %s', mixer_class.__name__) return mixer_class.start(config=config, audio=audio).proxy() - def start_core(self, audio, mixer, backends): + def start_core(self, mixer, backends): logger.info('Starting Mopidy core') - return Core.start(audio=audio, backends=backends).proxy() + return Core.start(mixer=mixer, backends=backends).proxy() def start_frontends(self, config, frontend_classes, core): logger.info( diff --git a/mopidy/core/actor.py b/mopidy/core/actor.py index a3dba245..e8c600ed 100644 --- a/mopidy/core/actor.py +++ b/mopidy/core/actor.py @@ -32,7 +32,7 @@ class Core(pykka.ThreadingActor, audio.AudioListener, backend.BackendListener): """The tracklist controller. An instance of :class:`mopidy.core.TracklistController`.""" - def __init__(self, audio=None, backends=None): + def __init__(self, mixer=None, backends=None): super(Core, self).__init__() self.backends = Backends(backends) @@ -40,7 +40,7 @@ class Core(pykka.ThreadingActor, audio.AudioListener, backend.BackendListener): self.library = LibraryController(backends=self.backends, core=self) self.playback = PlaybackController( - audio=audio, backends=self.backends, core=self) + mixer=mixer, backends=self.backends, core=self) self.playlists = PlaylistsController( backends=self.backends, core=self) diff --git a/mopidy/core/playback.py b/mopidy/core/playback.py index 7f4a31f4..8988aa9e 100644 --- a/mopidy/core/playback.py +++ b/mopidy/core/playback.py @@ -13,8 +13,8 @@ logger = logging.getLogger(__name__) class PlaybackController(object): pykka_traversable = True - def __init__(self, audio, backends, core): - self.audio = audio + def __init__(self, mixer, backends, core): + self.mixer = mixer self.backends = backends self.core = core @@ -88,15 +88,15 @@ class PlaybackController(object): """Time position in milliseconds.""" def get_volume(self): - if self.audio: - return self.audio.get_volume().get() + if self.mixer: + return self.mixer.get_volume().get() else: # For testing return self._volume def set_volume(self, volume): - if self.audio: - self.audio.set_volume(volume) + if self.mixer: + self.mixer.set_volume(volume) else: # For testing self._volume = volume @@ -107,16 +107,16 @@ class PlaybackController(object): """Volume as int in range [0..100] or :class:`None`""" def get_mute(self): - if self.audio: - return self.audio.get_mute().get() + if self.mixer: + return self.mixer.get_mute().get() else: # For testing return self._mute def set_mute(self, value): value = bool(value) - if self.audio: - self.audio.set_mute(value) + if self.mixer: + self.mixer.set_mute(value) else: # For testing self._mute = value diff --git a/tests/core/test_actor.py b/tests/core/test_actor.py index 47ac0168..79d778af 100644 --- a/tests/core/test_actor.py +++ b/tests/core/test_actor.py @@ -20,7 +20,7 @@ class CoreActorTest(unittest.TestCase): self.backend2.uri_schemes.get.return_value = ['dummy2'] self.backend2.actor_ref.actor_class.__name__ = b'B2' - self.core = Core(audio=None, backends=[self.backend1, self.backend2]) + self.core = Core(mixer=None, backends=[self.backend1, self.backend2]) def tearDown(self): pykka.ActorRegistry.stop_all() @@ -37,7 +37,7 @@ class CoreActorTest(unittest.TestCase): self.assertRaisesRegexp( AssertionError, 'Cannot add URI scheme dummy1 for B2, it is already handled by B1', - Core, audio=None, backends=[self.backend1, self.backend2]) + Core, mixer=None, backends=[self.backend1, self.backend2]) def test_version(self): self.assertEqual(self.core.version, versioning.get_version()) diff --git a/tests/core/test_library.py b/tests/core/test_library.py index 1db22688..9eac3ebd 100644 --- a/tests/core/test_library.py +++ b/tests/core/test_library.py @@ -30,7 +30,7 @@ class CoreLibraryTest(unittest.TestCase): self.backend3.has_library().get.return_value = False self.backend3.has_library_browse().get.return_value = False - self.core = core.Core(audio=None, backends=[ + self.core = core.Core(mixer=None, backends=[ self.backend1, self.backend2, self.backend3]) def test_browse_root_returns_dir_ref_for_each_lib_with_root_dir_name(self): diff --git a/tests/core/test_playback.py b/tests/core/test_playback.py index 7a97b3d7..09012139 100644 --- a/tests/core/test_playback.py +++ b/tests/core/test_playback.py @@ -36,7 +36,7 @@ class CorePlaybackTest(unittest.TestCase): Track(uri='dummy1:b', length=40000), ] - self.core = core.Core(audio=None, backends=[ + self.core = core.Core(mixer=None, backends=[ self.backend1, self.backend2, self.backend3]) self.core.tracklist.add(self.tracks) diff --git a/tests/core/test_playlists.py b/tests/core/test_playlists.py index 73b4f486..49f617b5 100644 --- a/tests/core/test_playlists.py +++ b/tests/core/test_playlists.py @@ -34,7 +34,7 @@ class PlaylistsTest(unittest.TestCase): self.pl2b = Playlist(name='B', tracks=[Track(uri='dummy2:b')]) self.sp2.playlists.get.return_value = [self.pl2a, self.pl2b] - self.core = core.Core(audio=None, backends=[ + self.core = core.Core(mixer=None, backends=[ self.backend3, self.backend1, self.backend2]) def test_get_playlists_combines_result_from_backends(self): diff --git a/tests/core/test_tracklist.py b/tests/core/test_tracklist.py index 9f4dc9c0..963a4bb7 100644 --- a/tests/core/test_tracklist.py +++ b/tests/core/test_tracklist.py @@ -21,7 +21,7 @@ class TracklistTest(unittest.TestCase): self.library = mock.Mock(spec=backend.LibraryProvider) self.backend.library = self.library - self.core = core.Core(audio=None, backends=[self.backend]) + self.core = core.Core(mixer=None, backends=[self.backend]) self.tl_tracks = self.core.tracklist.add(self.tracks) def test_add_by_uri_looks_up_uri_in_library(self): diff --git a/tests/local/test_tracklist.py b/tests/local/test_tracklist.py index 7717f1a5..af07a4e6 100644 --- a/tests/local/test_tracklist.py +++ b/tests/local/test_tracklist.py @@ -30,7 +30,7 @@ class LocalTracklistProviderTest(unittest.TestCase): self.audio = audio.DummyAudio.start().proxy() self.backend = actor.LocalBackend.start( config=self.config, audio=self.audio).proxy() - self.core = core.Core(audio=self.audio, backends=[self.backend]) + self.core = core.Core(mixer=None, backends=[self.backend]) self.controller = self.core.tracklist self.playback = self.core.playback