diff --git a/mopidy/frontends/mpd/dispatcher.py b/mopidy/frontends/mpd/dispatcher.py index 2b012c7c..94ac6bf9 100644 --- a/mopidy/frontends/mpd/dispatcher.py +++ b/mopidy/frontends/mpd/dispatcher.py @@ -15,7 +15,6 @@ from mopidy.frontends.mpd.protocol import (audio_output, command_list, connection, current_playlist, empty, music_db, playback, reflection, status, stickers, stored_playlists) # pylint: enable = W0611 -from mopidy.mixers.base import BaseMixer from mopidy.utils import flatten logger = logging.getLogger('mopidy.frontends.mpd.dispatcher') @@ -235,7 +234,6 @@ class MpdContext(object): self.events = set() self.subscriptions = set() self._backend = None - self._mixer = None @property def backend(self): @@ -248,14 +246,3 @@ class MpdContext(object): 'Expected exactly one running backend.' self._backend = backend_refs[0].proxy() return self._backend - - @property - def mixer(self): - """ - The mixer. An instance of :class:`mopidy.mixers.base.BaseMixer`. - """ - if self._mixer is None: - mixer_refs = ActorRegistry.get_by_class(BaseMixer) - assert len(mixer_refs) == 1, 'Expected exactly one running mixer.' - self._mixer = mixer_refs[0].proxy() - return self._mixer diff --git a/mopidy/frontends/mpd/protocol/playback.py b/mopidy/frontends/mpd/protocol/playback.py index 948083a8..4cf33266 100644 --- a/mopidy/frontends/mpd/protocol/playback.py +++ b/mopidy/frontends/mpd/protocol/playback.py @@ -353,7 +353,7 @@ def setvol(context, volume): volume = 0 if volume > 100: volume = 100 - context.mixer.volume = volume + context.backend.playback.volume = volume @handle_request(r'^single (?P[01])$') @handle_request(r'^single "(?P[01])"$') diff --git a/mopidy/frontends/mpd/protocol/status.py b/mopidy/frontends/mpd/protocol/status.py index 81b68dd6..4a9ad9a1 100644 --- a/mopidy/frontends/mpd/protocol/status.py +++ b/mopidy/frontends/mpd/protocol/status.py @@ -168,7 +168,7 @@ def status(context): futures = { 'current_playlist.length': context.backend.current_playlist.length, 'current_playlist.version': context.backend.current_playlist.version, - 'mixer.volume': context.mixer.volume, + 'playback.volume': context.backend.playback.volume, 'playback.consume': context.backend.playback.consume, 'playback.random': context.backend.playback.random, 'playback.repeat': context.backend.playback.repeat, @@ -263,7 +263,7 @@ def _status_time_total(futures): return current_cp_track.track.length def _status_volume(futures): - volume = futures['mixer.volume'].get() + volume = futures['playback.volume'].get() if volume is not None: return volume else: diff --git a/tests/frontends/mpd/dispatcher_test.py b/tests/frontends/mpd/dispatcher_test.py index bfa7c548..63f6d299 100644 --- a/tests/frontends/mpd/dispatcher_test.py +++ b/tests/frontends/mpd/dispatcher_test.py @@ -2,7 +2,6 @@ from mopidy.backends.dummy import DummyBackend from mopidy.frontends.mpd.dispatcher import MpdDispatcher from mopidy.frontends.mpd.exceptions import MpdAckError from mopidy.frontends.mpd.protocol import request_handlers, handle_request -from mopidy.mixers.dummy import DummyMixer from tests import unittest @@ -10,12 +9,10 @@ from tests import unittest class MpdDispatcherTest(unittest.TestCase): def setUp(self): self.backend = DummyBackend.start().proxy() - self.mixer = DummyMixer.start().proxy() self.dispatcher = MpdDispatcher() def tearDown(self): self.backend.stop().get() - self.mixer.stop().get() def test_register_same_pattern_twice_fails(self): func = lambda: None diff --git a/tests/frontends/mpd/protocol/__init__.py b/tests/frontends/mpd/protocol/__init__.py index b54906be..b39ded01 100644 --- a/tests/frontends/mpd/protocol/__init__.py +++ b/tests/frontends/mpd/protocol/__init__.py @@ -3,7 +3,6 @@ import mock from mopidy import settings from mopidy.backends import dummy as backend from mopidy.frontends import mpd -from mopidy.mixers import dummy as mixer from tests import unittest @@ -23,7 +22,6 @@ class MockConnection(mock.Mock): class BaseTestCase(unittest.TestCase): def setUp(self): self.backend = backend.DummyBackend.start().proxy() - self.mixer = mixer.DummyMixer.start().proxy() self.connection = MockConnection() self.session = mpd.MpdSession(self.connection) @@ -32,7 +30,6 @@ class BaseTestCase(unittest.TestCase): def tearDown(self): self.backend.stop().get() - self.mixer.stop().get() settings.runtime.clear() def sendRequest(self, request): diff --git a/tests/frontends/mpd/protocol/playback_test.py b/tests/frontends/mpd/protocol/playback_test.py index 01658f6d..87c9bbb8 100644 --- a/tests/frontends/mpd/protocol/playback_test.py +++ b/tests/frontends/mpd/protocol/playback_test.py @@ -76,37 +76,37 @@ class PlaybackOptionsHandlerTest(protocol.BaseTestCase): def test_setvol_below_min(self): self.sendRequest(u'setvol "-10"') - self.assertEqual(0, self.mixer.volume.get()) + self.assertEqual(0, self.backend.playback.volume.get()) self.assertInResponse(u'OK') def test_setvol_min(self): self.sendRequest(u'setvol "0"') - self.assertEqual(0, self.mixer.volume.get()) + self.assertEqual(0, self.backend.playback.volume.get()) self.assertInResponse(u'OK') def test_setvol_middle(self): self.sendRequest(u'setvol "50"') - self.assertEqual(50, self.mixer.volume.get()) + self.assertEqual(50, self.backend.playback.volume.get()) self.assertInResponse(u'OK') def test_setvol_max(self): self.sendRequest(u'setvol "100"') - self.assertEqual(100, self.mixer.volume.get()) + self.assertEqual(100, self.backend.playback.volume.get()) self.assertInResponse(u'OK') def test_setvol_above_max(self): self.sendRequest(u'setvol "110"') - self.assertEqual(100, self.mixer.volume.get()) + self.assertEqual(100, self.backend.playback.volume.get()) self.assertInResponse(u'OK') def test_setvol_plus_is_ignored(self): self.sendRequest(u'setvol "+10"') - self.assertEqual(10, self.mixer.volume.get()) + self.assertEqual(10, self.backend.playback.volume.get()) self.assertInResponse(u'OK') def test_setvol_without_quotes(self): self.sendRequest(u'setvol 50') - self.assertEqual(50, self.mixer.volume.get()) + self.assertEqual(50, self.backend.playback.volume.get()) self.assertInResponse(u'OK') def test_single_off(self): diff --git a/tests/frontends/mpd/status_test.py b/tests/frontends/mpd/status_test.py index 9fa62321..3701faaf 100644 --- a/tests/frontends/mpd/status_test.py +++ b/tests/frontends/mpd/status_test.py @@ -1,7 +1,6 @@ from mopidy.backends import dummy as backend from mopidy.frontends.mpd import dispatcher from mopidy.frontends.mpd.protocol import status -from mopidy.mixers import dummy as mixer from mopidy.models import Track from tests import unittest @@ -17,13 +16,11 @@ STOPPED = backend.PlaybackController.STOPPED class StatusHandlerTest(unittest.TestCase): def setUp(self): self.backend = backend.DummyBackend.start().proxy() - self.mixer = mixer.DummyMixer.start().proxy() self.dispatcher = dispatcher.MpdDispatcher() self.context = self.dispatcher.context def tearDown(self): self.backend.stop().get() - self.mixer.stop().get() def test_stats_method(self): result = status.stats(self.context) @@ -48,7 +45,7 @@ class StatusHandlerTest(unittest.TestCase): self.assertEqual(int(result['volume']), -1) def test_status_method_contains_volume(self): - self.mixer.volume = 17 + self.backend.playback.volume = 17 result = dict(status.status(self.context)) self.assert_('volume' in result) self.assertEqual(int(result['volume']), 17)