diff options
Diffstat (limited to 'src/components/hmi_message_handler')
5 files changed, 10 insertions, 5 deletions
diff --git a/src/components/hmi_message_handler/include/hmi_message_handler/messagebroker_adapter.h b/src/components/hmi_message_handler/include/hmi_message_handler/messagebroker_adapter.h index 13314ba0da..df344c80fd 100644 --- a/src/components/hmi_message_handler/include/hmi_message_handler/messagebroker_adapter.h +++ b/src/components/hmi_message_handler/include/hmi_message_handler/messagebroker_adapter.h @@ -47,7 +47,7 @@ class MessageBrokerAdapter : public HMIMessageAdapter, public: MessageBrokerAdapter(HMIMessageHandler* handler_param, const std::string& server_address, uint16_t port); - ~MessageBrokerAdapter(); + ~MessageBrokerAdapter(); void SendMessageToHMI(MessageSharedPointer message); /*Methods from CMessageBrokerController*/ diff --git a/src/components/hmi_message_handler/include/hmi_message_handler/mqueue_adapter.h b/src/components/hmi_message_handler/include/hmi_message_handler/mqueue_adapter.h index b0fb016622..9d78fefc69 100644 --- a/src/components/hmi_message_handler/include/hmi_message_handler/mqueue_adapter.h +++ b/src/components/hmi_message_handler/include/hmi_message_handler/mqueue_adapter.h @@ -55,7 +55,7 @@ class MqueueAdapter : public HMIMessageAdapter { private: mqd_t sdl_to_hmi_mqueue_; mqd_t hmi_to_sdl_mqueue_; - std::auto_ptr<threads::Thread> receiver_thread_; + threads::Thread* receiver_thread_; }; } // namespace hmi_message_handler diff --git a/src/components/hmi_message_handler/src/dbus_message_adapter.cc b/src/components/hmi_message_handler/src/dbus_message_adapter.cc index 1842789b22..a79674df67 100644 --- a/src/components/hmi_message_handler/src/dbus_message_adapter.cc +++ b/src/components/hmi_message_handler/src/dbus_message_adapter.cc @@ -118,6 +118,7 @@ void DBusMessageAdapter::SubscribeTo() { DBusMessageController::SubscribeTo("BasicCommunication", "OnIgnitionCycleOver"); DBusMessageController::SubscribeTo("BasicCommunication", "OnSystemRequest"); DBusMessageController::SubscribeTo("BasicCommunication", "OnSystemInfoChanged"); + DBusMessageController::SubscribeTo("BasicCommunication", "OnPhoneCall"); DBusMessageController::SubscribeTo("TTS", "Started"); DBusMessageController::SubscribeTo("TTS", "Stopped"); DBusMessageController::SubscribeTo("TTS", "OnLanguageChange"); diff --git a/src/components/hmi_message_handler/src/messagebroker_adapter.cc b/src/components/hmi_message_handler/src/messagebroker_adapter.cc index 52975b257b..8779d2ea6d 100644 --- a/src/components/hmi_message_handler/src/messagebroker_adapter.cc +++ b/src/components/hmi_message_handler/src/messagebroker_adapter.cc @@ -111,6 +111,7 @@ void MessageBrokerAdapter::SubscribeTo() { MessageBrokerController::subscribeTo("BasicCommunication.OnExitApplication"); MessageBrokerController::subscribeTo("BasicCommunication.OnExitAllApplications"); MessageBrokerController::subscribeTo("BasicCommunication.OnDeviceChosen"); + MessageBrokerController::subscribeTo("BasicCommunication.OnPhoneCall"); MessageBrokerController::subscribeTo("UI.OnLanguageChange"); MessageBrokerController::subscribeTo("VR.OnLanguageChange"); MessageBrokerController::subscribeTo("TTS.OnLanguageChange"); diff --git a/src/components/hmi_message_handler/src/mqueue_adapter.cc b/src/components/hmi_message_handler/src/mqueue_adapter.cc index 0164c3c85c..b1524b5f03 100644 --- a/src/components/hmi_message_handler/src/mqueue_adapter.cc +++ b/src/components/hmi_message_handler/src/mqueue_adapter.cc @@ -98,13 +98,16 @@ MqueueAdapter::MqueueAdapter(HMIMessageHandler* hmi_message_handler) } ReceiverThreadDelegate* receiver_thread_delegate = new ReceiverThreadDelegate(hmi_to_sdl_mqueue_, hmi_message_handler); - receiver_thread_.reset( - new threads::Thread("MqueueAdapter", receiver_thread_delegate)); + receiver_thread_ = + threads::CreateThread("MqueueAdapter", receiver_thread_delegate); receiver_thread_->start(); } MqueueAdapter::~MqueueAdapter() { - if (receiver_thread_.get()) receiver_thread_->stop(); + if (receiver_thread_) { + receiver_thread_->stop(); + threads::DeleteThread(receiver_thread_); + } if (-1 != hmi_to_sdl_mqueue_) mq_close(hmi_to_sdl_mqueue_); if (-1 != sdl_to_hmi_mqueue_) mq_close(sdl_to_hmi_mqueue_); mq_unlink(kHmiToSdlQueue); |