raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Code cleanups

Browse Source
This commit is contained in:
Ken Roberts 2017-08-06 16:33:53 -07:00
parent 864fd291a0
commit df47a4b6eb
1 changed files with 24 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
openlp/core/lib/projector/pjlink.py
View File

@ -149,38 +149,40 @@ class PJLinkCommands(object):
cmd=cmd, cmd=cmd,
data=data)) data=data))
# Check if we have a future command not available yet # Check if we have a future command not available yet
if cmd not in PJLINK_VALID_CMD: _cmd = cmd.upper()
_data = data.upper()
if _cmd not in PJLINK_VALID_CMD:
log.error("({ip}) Ignoring command='{cmd}' (Invalid/Unknown)".format(ip=self.ip, cmd=cmd)) log.error("({ip}) Ignoring command='{cmd}' (Invalid/Unknown)".format(ip=self.ip, cmd=cmd))
return return
elif cmd not in self.pjlink_functions: elif _cmd not in self.pjlink_functions:
log.warn("({ip}) Unable to process command='{cmd}' (Future option)".format(ip=self.ip, cmd=cmd)) log.warn("({ip}) Unable to process command='{cmd}' (Future option)".format(ip=self.ip, cmd=cmd))
return return
elif data in PJLINK_ERRORS: elif _data in PJLINK_ERRORS:
# Oops - projector error # Oops - projector error
log.error('({ip}) Projector returned error "{data}"'.format(ip=self.ip, data=data)) log.error('({ip}) Projector returned error "{data}"'.format(ip=self.ip, data=data))
if data.upper() == 'ERRA': if _data == 'ERRA':
# Authentication error # Authentication error
self.disconnect_from_host() self.disconnect_from_host()
self.change_status(E_AUTHENTICATION) self.change_status(E_AUTHENTICATION)
log.debug('({ip}) emitting projectorAuthentication() signal'.format(ip=self.ip)) log.debug('({ip}) emitting projectorAuthentication() signal'.format(ip=self.ip))
self.projectorAuthentication.emit(self.name) self.projectorAuthentication.emit(self.name)
elif data.upper() == 'ERR1': elif _data == 'ERR1':
# Undefined command # Undefined command
self.change_status(E_UNDEFINED, '{error}: "{data}"'.format(error=ERROR_MSG[E_UNDEFINED], self.change_status(E_UNDEFINED, '{error}: "{data}"'.format(error=ERROR_MSG[E_UNDEFINED],
data=cmd)) data=cmd))
elif data.upper() == 'ERR2': elif _data == 'ERR2':
# Invalid parameter # Invalid parameter
self.change_status(E_PARAMETER) self.change_status(E_PARAMETER)
elif data.upper() == 'ERR3': elif _data == 'ERR3':
# Projector busy # Projector busy
self.change_status(E_UNAVAILABLE) self.change_status(E_UNAVAILABLE)
elif data.upper() == 'ERR4': elif _data == 'ERR4':
# Projector/display error # Projector/display error
self.change_status(E_PROJECTOR) self.change_status(E_PROJECTOR)
self.receive_data_signal() self.receive_data_signal()
return return
# Command succeeded - no extra information # Command succeeded - no extra information
elif data.upper() == 'OK': elif _data == 'OK':
log.debug('({ip}) Command returned OK'.format(ip=self.ip)) log.debug('({ip}) Command returned OK'.format(ip=self.ip))
# A command returned successfully # A command returned successfully
self.receive_data_signal() self.receive_data_signal()
@ -188,7 +190,7 @@ class PJLinkCommands(object):
# Command checks already passed # Command checks already passed
log.debug('({ip}) Calling function for {cmd}'.format(ip=self.ip, cmd=cmd)) log.debug('({ip}) Calling function for {cmd}'.format(ip=self.ip, cmd=cmd))
self.receive_data_signal() self.receive_data_signal()
self.pjlink_functions[cmd](data) self.pjlink_functions[_cmd](data)
def process_avmt(self, data): def process_avmt(self, data):
""" """
@ -197,26 +199,20 @@ class PJLinkCommands(object):
:param data: Shutter and audio status :param data: Shutter and audio status
""" """
shutter = self.shutter settings = {'11': {'shutter': True, 'mute': self.mute},
mute = self.mute '21': {'shutter': self.shutter, 'mute': True},
if data == '11': '30': {'shutter': False, 'mute': False},
shutter = True '31': {'shutter': True, 'mute': True}
mute = False }
elif data == '21': if data in settings:
shutter = False shutter = settings[data]['shutter']
mute = True mute = settings[data]['mute']
elif data == '30': # Check if we need to update the icons
shutter = False update_icons = (shutter != self.shutter) or (mute != self.mute)
mute = False self.shutter = shutter
elif data == '31': self.mute = mute
shutter = True
mute = True
else: else:
log.warning('({ip}) Unknown shutter response: {data}'.format(ip=self.ip, data=data)) log.warning('({ip}) Unknown shutter response: {data}'.format(ip=self.ip, data=data))
update_icons = shutter != self.shutter
update_icons = update_icons or mute != self.mute
self.shutter = shutter
self.mute = mute
if update_icons: if update_icons:
self.projectorUpdateIcons.emit() self.projectorUpdateIcons.emit()
return return