Revision 482adb6d server/include/Arbiter.h

View differences:

server/include/Arbiter.h
29 29
#pragma once
30 30
#include <string>
31 31
#include <vector>
32
#include <boost/shared_ptr.hpp>
32
#include <memory>
33 33
#include <mutex>
34 34
#include <humotion/client/client.h>
35 35
#include "EmotionState.h"
......
49 49
	void set_default_emotion(EmotionState e);
50 50
	void set_current_emotion(EmotionState e);
51 51
	void set_mouth_config(MouthConfig m);
52
	void speak(boost::shared_ptr<Utterance> u);
52
	void speak(std::shared_ptr<Utterance> u);
53 53
	bool speak_active();
54 54

  
55 55
	void set_gaze_target(humotion::GazeState g);
56 56
	void set_mouth_target(humotion::MouthState target);
57
	void play_animation(boost::shared_ptr<Animation> ani);
57
	void play_animation(std::shared_ptr<Animation> ani);
58 58

  
59 59
	humotion::GazeState get_gaze_state();
60 60
	humotion::MouthState get_mouth_state();
......
83 83

  
84 84
	MouthConfig mouth_config;
85 85

  
86
	boost::shared_ptr<Utterance> utterance;
86
	std::shared_ptr<Utterance> utterance;
87 87

  
88 88
	humotion::GazeState requested_gaze_state;
89 89
	humotion::MouthState requested_mouth_state;
......
99 99
	std::mutex animation_mutex;
100 100
	Animation active_animation;
101 101

  
102
	typedef std::vector<boost::shared_ptr<Animation>> active_animation_vector_t;
102
	typedef std::vector<std::shared_ptr<Animation>> active_animation_vector_t;
103 103
	std::mutex active_animation_vector_mutex;
104 104
	active_animation_vector_t active_animation_vector;
105 105

  

Also available in: Unified diff