Radio starting and stopping

This commit is contained in:
James Barnsley
2016-12-20 19:54:19 +13:00
parent bf3b2bfba1
commit 005e2b58b5
6 changed files with 22 additions and 10 deletions

View File

@ -98,7 +98,7 @@ class IrisFrontend(pykka.ThreadingActor, CoreListener):
self.load_more_tracks()
except RuntimeError:
logger.warning('RadioHandler: Could not fetch tracklist length')
logger.warning('IrisFrontend: Could not fetch tracklist length')
pass
@ -156,7 +156,7 @@ class IrisFrontend(pykka.ThreadingActor, CoreListener):
self.core.playback.play()
# notify clients
pusher.broadcast( 'radio_started', { 'radio': self.radio })
pusher.broadcast( 'radio', { 'radio': self.radio })
# return new radio state to initial call
return self.radio
@ -178,7 +178,7 @@ class IrisFrontend(pykka.ThreadingActor, CoreListener):
self.core.playback.stop()
# notify clients
pusher.broadcast( 'radio_stopped', { 'radio': self.radio })
pusher.broadcast( 'radio', { 'radio': self.radio })
# return new radio state to initial call
return self.radio

View File

@ -194,7 +194,7 @@ class PusherWebsocketHandler(tornado.websocket.WebSocketHandler):
send_message(
self.connectionid,
'response',
'radio_started',
'radio',
messageJson['message_id'],
{ 'radio': radio }
)
@ -205,7 +205,7 @@ class PusherWebsocketHandler(tornado.websocket.WebSocketHandler):
send_message(
self.connectionid,
'response',
messageJson['action'],
'radio',
messageJson['message_id'],
{ 'radio': self.frontend.radio }
)
@ -215,7 +215,7 @@ class PusherWebsocketHandler(tornado.websocket.WebSocketHandler):
send_message(
self.connectionid,
'response',
messageJson['action'],
'radio',
messageJson['message_id'],
{ 'radio': self.frontend.radio }
)