Mercurial > libervia-web
comparison libervia.tac @ 130:6576c5a90060
Working Radio Collective \o/
author | Goffi <goffi@goffi.org> |
---|---|
date | Sun, 29 Jan 2012 02:56:21 +0100 |
parents | dd0d39ae7d24 |
children | ddfcc4cb6cee |
comparison
equal
deleted
inserted
replaced
129:dd0d39ae7d24 | 130:6576c5a90060 |
---|---|
506 try: | 506 try: |
507 #We purge the queue | 507 #We purge the queue |
508 del self.sat_host.signal_handler.queue[profile] | 508 del self.sat_host.signal_handler.queue[profile] |
509 except KeyError: | 509 except KeyError: |
510 pass | 510 pass |
511 #and now we deconnect the profile | 511 #and now we disconnect the profile |
512 self.sat_host.bridge.disconnect(profile) | 512 self.sat_host.bridge.disconnect(profile) |
513 | 513 |
514 _session.notifyOnExpire(onExpire) | 514 _session.notifyOnExpire(onExpire) |
515 | 515 |
516 d = defer.Deferred() | 516 d = defer.Deferred() |
673 for signal_name in ['presenceUpdate', 'newMessage', 'subscribe', 'contactDeleted', 'newContact', 'updatedValue']: | 673 for signal_name in ['presenceUpdate', 'newMessage', 'subscribe', 'contactDeleted', 'newContact', 'updatedValue']: |
674 self.bridge.register(signal_name, self.signal_handler.getGenericCb(signal_name)) | 674 self.bridge.register(signal_name, self.signal_handler.getGenericCb(signal_name)) |
675 #plugins | 675 #plugins |
676 for signal_name in ['personalEvent', 'roomJoined', 'roomUserJoined', 'roomUserLeft', 'tarotGameStarted', 'tarotGameNew', 'tarotGameChooseContrat', | 676 for signal_name in ['personalEvent', 'roomJoined', 'roomUserJoined', 'roomUserLeft', 'tarotGameStarted', 'tarotGameNew', 'tarotGameChooseContrat', |
677 'tarotGameShowCards', 'tarotGameInvalidCards', 'tarotGameCardsPlayed', 'tarotGameYourTurn', 'tarotGameScore', | 677 'tarotGameShowCards', 'tarotGameInvalidCards', 'tarotGameCardsPlayed', 'tarotGameYourTurn', 'tarotGameScore', |
678 'radiocolStarted', 'radiocolPreload']: | 678 'radiocolStarted', 'radiocolPreload', 'radiocolPlay', 'radiocolNoUpload', 'radiocolUploadOk', 'radiocolSongRejected']: |
679 self.bridge.register(signal_name, self.signal_handler.getGenericCb(signal_name), "plugin") | 679 self.bridge.register(signal_name, self.signal_handler.getGenericCb(signal_name), "plugin") |
680 self.media_dir = self.bridge.getConfig('','media_dir') | 680 self.media_dir = self.bridge.getConfig('','media_dir') |
681 self.local_dir = self.bridge.getConfig('','local_dir') | 681 self.local_dir = self.bridge.getConfig('','local_dir') |
682 root.putChild('json_signal_api', self.signal_handler) | 682 root.putChild('json_signal_api', self.signal_handler) |
683 root.putChild('json_api', MethodHandler(self)) | 683 root.putChild('json_api', MethodHandler(self)) |