X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=low-can-binding%2Futils%2Fsignals.cpp;h=a26906e05b66b7b796f75cd05ecb37c58dfdf555;hb=2e10ab5760e5d2a6abab7acf47f781442308362f;hp=7011fa5a459300fc263f494357fc1ac8c26cb0e9;hpb=e2af4a871c6a8bcab4733193948833aed9c5ceb8;p=apps%2Fagl-service-can-low-level.git

diff --git a/low-can-binding/utils/signals.cpp b/low-can-binding/utils/signals.cpp
index 7011fa5a..a26906e0 100644
--- a/low-can-binding/utils/signals.cpp
+++ b/low-can-binding/utils/signals.cpp
@@ -39,14 +39,14 @@ namespace utils
 	/// @brief return the subscribed_signals map.
 	///
 	/// @return Map of subscribed signals.
-	std::map<int, std::shared_ptr<low_can_subscription_t> >& signals_manager_t::get_subscribed_signals()
+	map_subscription& signals_manager_t::get_subscribed_signals()
 	{
 		return subscribed_signals_;
 	}
 
 	///
 	/// @fn std::vector<std::string> find_signals(const openxc_DynamicField &key)
-	/// @brief return signals name found searching through CAN_signals and OBD2 pid
+	/// @brief return signals name found searching through signals and OBD2 pid
 	///
 	/// @param[in] key : can contain numeric or string value in order to search against
 	///   can signals or obd2 signals name.
@@ -60,18 +60,18 @@ namespace utils
 		switch(key.type)
 		{
 			case openxc_DynamicField_Type::openxc_DynamicField_Type_STRING:
-					lookup_signals_by_name(key.string_value, application_t::instance().get_all_can_signals(), sf.can_signals);
+					lookup_signals_by_name(key.string_value, application_t::instance().get_all_signals(), sf.signals);
 					lookup_signals_by_name(key.string_value, application_t::instance().get_diagnostic_messages(), sf.diagnostic_messages);
 				break;
 			case openxc_DynamicField_Type::openxc_DynamicField_Type_NUM:
-					lookup_signals_by_id(key.numeric_value, application_t::instance().get_all_can_signals(), sf.can_signals);
+					lookup_signals_by_id(key.numeric_value, application_t::instance().get_all_signals(), sf.signals);
 					lookup_signals_by_id(key.numeric_value, application_t::instance().get_diagnostic_messages(), sf.diagnostic_messages);
 				break;
 			default:
 				AFB_ERROR("wrong openxc_DynamicField specified. Use openxc_DynamicField_Type_NUM or openxc_DynamicField_Type_STRING type only.");
 				break;
 		}
-		AFB_DEBUG("Found %d signal(s)", (int)(sf.can_signals.size() + sf.diagnostic_messages.size()));
+		AFB_DEBUG("Found %d signal(s)", (int)(sf.signals.size() + sf.diagnostic_messages.size()));
 		return sf;
 	}
 }