andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Prefer the word 'amplifier' over too generic 'device' in docs and log messages

Browse Source
This commit is contained in:
Stein Magnus Jodal 2012-09-08 22:24:48 +02:00
parent 5368f75f3a
commit e741b4db75
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mopidy/mixers/nad.py
View File

@ -80,11 +80,11 @@ gst.element_register(NadMixer, 'nadmixer', gst.RANK_MARGINAL)
class NadTalker(ThreadingActor): class NadTalker(ThreadingActor):
""" """
Independent thread which does the communication with the NAD device. Independent thread which does the communication with the NAD amplifier
Since the communication is done in an independent thread, Mopidy won't Since the communication is done in an independent thread, Mopidy won't
block other requests while doing rather time consuming work like block other requests while doing rather time consuming work like
calibrating the NAD device's volume. calibrating the NAD amplifier's volume.
""" """
# Serial link settings # Serial link settings
@ -100,7 +100,7 @@ class NadTalker(ThreadingActor):
# for NAD C 355BEE. # for NAD C 355BEE.
TIMEOUT = 0.2 TIMEOUT = 0.2
# Number of volume levels the device supports. 40 for NAD C 355BEE. # Number of volume levels the amplifier supports. 40 for NAD C 355BEE.
VOLUME_LEVELS = 40 VOLUME_LEVELS = 40
def __init__(self, port, source, speakers_a, speakers_b): def __init__(self, port, source, speakers_a, speakers_b):
@ -129,7 +129,7 @@ class NadTalker(ThreadingActor):
self._set_device_to_known_state() self._set_device_to_known_state()
def _open_connection(self): def _open_connection(self):
logger.info(u'Connecting to NAD amplifier using serial device "%s"', logger.info(u'Connecting to NAD amplifier using "%s"',
self.port) self.port)
self._device = serial.Serial( self._device = serial.Serial(
port=self.port, port=self.port,
@ -154,7 +154,7 @@ class NadTalker(ThreadingActor):
def _power_device_on(self): def _power_device_on(self):
while self._ask_device('Main.Power') != 'On': while self._ask_device('Main.Power') != 'On':
logger.info(u'Powering device on') logger.info(u'Powering NAD amplifier on')
self._command_device('Main.Power', 'On') self._command_device('Main.Power', 'On')
def _select_speakers(self): def _select_speakers(self):