Revision 8fd53883

View differences:

client/python/hlrc_client/MiddlewareRSB.py
103 103

  
104 104
            if (blocking):
105 105
                #blocking rpc call:
106
                if (em_type == EmotionExpression.TYPE_DEFAULT):
107
                    result = server.defaultEmotion(rsb_em)
108
                else:
109
                    result = server.currentEmotion(rsb_em)
110

  
106
                #if (em_type == EmotionExpression.TYPE_DEFAULT):
107
                #    result = server.defaultEmotion(rsb_em)
108
                #else:
109
                result = server.currentEmotion(rsb_em)
111 110
                self.logger.debug("server reply: '%s'" % result)
112 111
            else:
113
                if (em_type == EmotionExpression.TYPE_DEFAULT):
114
                    future = server.defaultEmotion.async(rsb_em)
115
                else:
116
                    future = server.currentEmotion.async(rsb_em)
117

  
118
                    #we could block here for a incoming result with a timeout in s
119
                    #print '> server reply: "%s"' % future.get(timeout = 10);
112
                #if (em_type == EmotionExpression.TYPE_DEFAULT):
113
                #    future = server.defaultEmotion.async(rsb_em)
114
                #else:
115
                future = server.currentEmotion.async(rsb_em)
116
                self.logger.debug("server reply: '%s'" % future)
117
                #we could block here for a incoming result with a timeout in s
118
                #print '> server reply: "%s"' % future.get(timeout = 10);
120 119
            self.logger.debug("emotion rpc done")
121 120

  
122 121
    def publish_head_HeadAnimation(self, HeadAnimation, blocking):

Also available in: Unified diff