Revision 42084118 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"
......
88 88 
	humotion::GazeState requested_gaze_state;
89 89 
	humotion::MouthState requested_mouth_state;
90 90 

  		




  91
  
  
    
	boost::mutex emotion_config_default_mutex;


  		




  92
  
  
    
	boost::mutex emotion_config_current_mutex;


  		




  93
  
  
    
	boost::mutex mouth_config_override_mutex;


  		




  94
  
  
    
	boost::mutex utterance_mutex;


  		




  95
  
  
    
	boost::mutex requested_gaze_state_mutex;


  		




  96
  
  
    
	boost::mutex requested_mouth_state_mutex;


  		




  97
  
  
    
	boost::mutex audio_player_mutex;


  		




  
  91
  
    
	std::mutex emotion_config_default_mutex;


  		




  
  92
  
    
	std::mutex emotion_config_current_mutex;


  		




  
  93
  
    
	std::mutex mouth_config_override_mutex;


  		




  
  94
  
    
	std::mutex utterance_mutex;


  		




  
  95
  
    
	std::mutex requested_gaze_state_mutex;


  		




  
  96
  
    
	std::mutex requested_mouth_state_mutex;


  		




  
  97
  
    
	std::mutex audio_player_mutex;


  		




  98
  98
  
    

  		




  99
  
  
    
	boost::mutex animation_mutex;


  		




  
  99
  
    
	std::mutex animation_mutex;


  		




  100
  100
  
    
	Animation active_animation;


  		




  101
  101
  
    

  		




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


  		




  103
  
  
    
	boost::mutex active_animation_vector_mutex;


  		




  
  103
  
    
	std::mutex active_animation_vector_mutex;


  		




  104
  104
  
    
	active_animation_vector_t active_animation_vector;


  		




  105
  105
  
    

  		




  106
  106
  
    
	AudioPlayer* audio_player;


  		












Also available in:  Unified diff