diff options
| author | Ira Lytvynenko (GitHub) <ILytvynenko@luxoft.com> | 2018-03-22 14:54:44 +0200 |
|---|---|---|
| committer | Ira Lytvynenko (GitHub) <ILytvynenko@luxoft.com> | 2018-06-26 12:01:44 +0300 |
| commit | 8ad3ac6a5c1560e1f07516d81d99e711b3e2ee6f (patch) | |
| tree | ddac040495b2efa3c7d0d392682d27af883c58b5 /src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin | |
| parent | 20cfb81a16fe9569ad21be03108223610d913126 (diff) | |
| download | sdl_core-8ad3ac6a5c1560e1f07516d81d99e711b3e2ee6f.tar.gz | |
Fixes after rebase
Diffstat (limited to 'src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin')
2 files changed, 12 insertions, 5 deletions
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/perform_audio_pass_thru_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/perform_audio_pass_thru_request.h index a3e3559fb3..973143e751 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/perform_audio_pass_thru_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/perform_audio_pass_thru_request.h @@ -165,10 +165,6 @@ class PerformAudioPassThruRequest */ bool IsWaitingHMIResponse(); - /* flag display state of speak and ui perform audio - during perform audio pass thru*/ - bool awaiting_tts_speak_response_; - bool awaiting_ui_response_; /** * @brief Pair of result_code and success for mobile app */ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_vehicle_data_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_vehicle_data_request.h index 063a414df4..f95136f691 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_vehicle_data_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_vehicle_data_request.h @@ -3,6 +3,9 @@ Copyright (c) 2013, Ford Motor Company All rights reserved. + Copyright (c) 2017, Livio, Inc. + All rights reserved. + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -123,6 +126,14 @@ class SubscribeVehicleDataRequest app_mngr::ApplicationSharedPtr app, const smart_objects::SmartObject& msg_params) const; + DEPRECATED void CheckVISubscribtions( + app_mngr::ApplicationSharedPtr app, + std::string& out_info, + mobile_apis::Result::eType& out_result_code, + smart_objects::SmartObject& out_response_params, + smart_objects::SmartObject& out_request_params, + bool& out_result); + /** * @brief Checks if current application and other applications * were subscribed to VI, prepare data that need to send to mobile app @@ -136,7 +147,7 @@ class SubscribeVehicleDataRequest * HMI * @param result contains result that SDL sends to mobile app. */ - void CheckVISubscribtions(app_mngr::ApplicationSharedPtr app, + void CheckVISubscriptions(app_mngr::ApplicationSharedPtr app, std::string& out_info, mobile_apis::Result::eType& out_result_code, smart_objects::SmartObject& out_response_params, |