Revision 2cf3c285 server/include/MiddlewareROS.h

View differences:

server/include/MiddlewareROS.h
31 31
#ifdef ROS_SUPPORT
32 32
    #include "ros/ros.h"
33 33
    #include <actionlib/client/simple_action_client.h>
34
    #include <tf2_ros/transform_listener.h>
34 35

  
35 36
    //messages
36 37
    #include "hlrc_server/phoneme.h"
......
81 82
    //boost::shared_ptr<ros::NodeHandle> node_handle;
82 83
    ros::NodeHandle *ros_node_handle;
83 84
    bool tick_necessary;
84
    /*ros::ServiceServer animation_service;
85
    ros::ServiceServer utterance_service;
86
    ros::ServiceServer default_emotion_service;
87
    ros::ServiceServer current_emotion_service;
88
    ros::ServiceServer gaze_service;
89
    ros::ServiceServer tts_service;*/
85
    //listen to tf tree
86
    tf2_ros::Buffer tfBuffer;
87
    boost::shared_ptr<tf2_ros::TransformListener> tfListener;
88

  
89
    //FIXME: These pointers are never destroyed. Shouldn't they be shared_ptrs?
90 90
    AnimationCallbackWrapper *animation_action_server;
91 91
    UtteranceCallbackWrapper *utterance_action_server;
92 92
    EmotionCallbackWrapper *current_emotion_action_server;
......
98 98
    actionlib::SimpleActionClient<hlrc_server::ttsAction> *tts_ac;
99 99
#endif
100 100
};
101

  
102

  
103

  
104

  

Also available in: Unified diff