diff --git a/docs/changes.rst b/docs/changes.rst index 6298c8e3..922eba13 100644 --- a/docs/changes.rst +++ b/docs/changes.rst @@ -56,7 +56,7 @@ v0.8 (in development) Now is reduced to simply: - MIXER = u'nadmixer port=/dev/ttyUSB0 source=Aux speakers-a=On speakers-b=Off' + MIXER = u'nadmixer port=/dev/ttyUSB0 source=aux speakers-a=on speakers-b=off' The ``port`` property defaults to ``/dev/ttyUSB0``, and the rest of the properties may be left out if you don't want the mixer to adjust the settings diff --git a/mopidy/mixers/nad.py b/mopidy/mixers/nad.py index dad3e853..de959d41 100644 --- a/mopidy/mixers/nad.py +++ b/mopidy/mixers/nad.py @@ -108,16 +108,8 @@ class NadTalker(ThreadingActor): self.port = port self.source = source - if speakers_a in ('On', 'Off'): - self.speakers_a = speakers_a - else: - logger.warning('speakers-a must be "On" or "Off", or unset') - self.speakers_a = None - if speakers_b in ('On', 'Off'): - self.speakers_b = speakers_b - else: - logger.warning('speakers-b must be "On" or "Off", or unset') - self.speakers_b = None + self.speakers_a = speakers_a + self.speakers_b = speakers_b # Volume in range 0..VOLUME_LEVELS. :class:`None` before calibration. self._nad_volume = None @@ -157,13 +149,13 @@ class NadTalker(ThreadingActor): def _select_speakers(self): if self.speakers_a is not None: - self._check_and_set('Main.SpeakerA', self.speakers_a) + self._check_and_set('Main.SpeakerA', self.speakers_a.title()) if self.speakers_b is not None: - self._check_and_set('Main.SpeakerB', self.speakers_b) + self._check_and_set('Main.SpeakerB', self.speakers_b.title()) def _select_input_source(self): if self.source is not None: - self._check_and_set('Main.Source', self.source) + self._check_and_set('Main.Source', self.source.title()) def mute(self, mute): if mute: