Revision 995b7f4d server/include/Arbiter.h

View differences:

server/include/Arbiter.h
30 30 
#include <string>
31 31 
#include <vector>
32 32 
#include <boost/shared_ptr.hpp>
33 
#include <boost/thread/mutex.hpp>
33 
#include <mutex>
34 34 
#include <humotion/client/client.h>
35 35 
#include "EmotionState.h"
36 36 
#include "EmotionConfig.h"
......
91 91 
    humotion::MouthState requested_mouth_state;
92 92 

  		




  93
  93
  
    

  		




  94
  
  
    
    boost::mutex emotion_config_default_mutex;


  		




  95
  
  
    
    boost::mutex emotion_config_current_mutex;


  		




  96
  
  
    
    boost::mutex mouth_config_override_mutex;


  		




  97
  
  
    
    boost::mutex utterance_mutex;


  		




  98
  
  
    
    boost::mutex requested_gaze_state_mutex;


  		




  99
  
  
    
    boost::mutex requested_mouth_state_mutex;


  		




  100
  
  
    
    boost::mutex audio_player_mutex;


  		




  
  94
  
    
    std::mutex emotion_config_default_mutex;


  		




  
  95
  
    
    std::mutex emotion_config_current_mutex;


  		




  
  96
  
    
    std::mutex mouth_config_override_mutex;


  		




  
  97
  
    
    std::mutex utterance_mutex;


  		




  
  98
  
    
    std::mutex requested_gaze_state_mutex;


  		




  
  99
  
    
    std::mutex requested_mouth_state_mutex;


  		




  
  100
  
    
    std::mutex audio_player_mutex;


  		




  101
  101
  
    

  		




  102
  
  
    
    boost::mutex animation_mutex;


  		




  
  102
  
    
    std::mutex animation_mutex;


  		




  103
  103
  
    
    Animation active_animation;


  		




  104
  104
  
    

  		




  105
  105
  
    
    typedef std::vector<boost::shared_ptr<Animation>> active_animation_vector_t;


  		




  106
  
  
    
    boost::mutex active_animation_vector_mutex;


  		




  
  106
  
    
    std::mutex active_animation_vector_mutex;


  		




  107
  107
  
    
    active_animation_vector_t active_animation_vector;


  		




  108
  108
  
    

  		




  109
  109
  
    

  		












Also available in:  Unified diff