* Bug fix 392. Some improvements regarding failed transactions in the router.

Signed-off-by: Christian Linke <christian.linke@bmw.de>

3 files changed, 19 insertions, 5 deletions

diff --git a/include/IAmControl.h b/include/IAmControl.h
index 8220728..53526fe 100644
--- a/include/IAmControl.h
+++ b/include/IAmControl.h
@@ -32,7 +32,7 @@ class CAmSocketHandler;
 

 #include "audiomanagertypes.h"

 

-#define ControlVersion "4.0" 

+#define ControlVersion "5.0"

 namespace am {

 

 /**

@@ -639,6 +639,11 @@ public:
 	 * @return E_OK when successful, E_DATABASE on error

 	 */

 	virtual am_Error_e getSourceSoundPropertyValue(const am_sourceID_t sourceID, const am_CustomSoundPropertyType_t propertyType, int16_t& value) const =0;

+	/**

+	 * Retrieves a list of all current active connections from a domain. This method

+	 * is meant to be used if the audiomanager and a remote domain are out of sync.

+	 */

+	virtual am_Error_e resyncConnectionState(const am_domainID_t domainID, std::vector<am_Connection_s>& listOfExistingConnections) =0;

 

 };

 

diff --git a/include/IAmRouting.h b/include/IAmRouting.h
index 14f1146..1acaac6 100644
--- a/include/IAmRouting.h
+++ b/include/IAmRouting.h
@@ -35,7 +35,7 @@ class CAmSocketHandler;
 

 #include "audiomanagertypes.h"

 

-#define RoutingVersion "4.0" 

+#define RoutingVersion "5.0"

 namespace am {

 

 /**

@@ -482,6 +482,11 @@ public:
 	 * @return E_OK on success, E_UNKNOWN on error.

 	 */

 	virtual am_Error_e asyncSetSourceNotificationConfiguration(const am_Handle_s handle, const am_sourceID_t sourceID, const am_NotificationConfiguration_s& notificationConfiguration) =0;

+	/**

+	 * Retrieves a list of all current active connections from a domain. This method

+	 * is meant to be used if the audiomanager and a remote domain are out of sync.

+	 */

+	virtual am_Error_e resyncConnectionState(const am_domainID_t domainID, std::vector<am_Connection_s>& listOfExistingConnections) =0;

 

 };

 }

diff --git a/include/audiomanagertypes.h b/include/audiomanagertypes.h
index aeb802d..d60e2a3 100755
--- a/include/audiomanagertypes.h
+++ b/include/audiomanagertypes.h
@@ -20,8 +20,8 @@
  * THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. 

  * PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN.

  */

-#if !defined(EA_95D3C82A_0870_4fe0_A468_5AFF99D80A26__INCLUDED_)

-#define EA_95D3C82A_0870_4fe0_A468_5AFF99D80A26__INCLUDED_

+#if !defined(EA_E0F066FD_E6D8_4ca9_84C3_D0C02AF09BF8__INCLUDED_)

+#define EA_E0F066FD_E6D8_4ca9_84C3_D0C02AF09BF8__INCLUDED_

 

 #include <stdint.h>

 #include <string>

@@ -372,6 +372,10 @@ enum am_Error_e
 	 * capabilities of a source or a sink or gateway compatibilities for example

 	 */

 	E_WRONG_FORMAT = 10,

+	/**

+	 * A communication error happened

+	 */

+	E_COMMUNICATION = 11,

 	E_MAX

 };

 

@@ -1461,4 +1465,4 @@ public:
 

 };

 }

-#endif // !defined(EA_95D3C82A_0870_4fe0_A468_5AFF99D80A26__INCLUDED_)

+#endif // !defined(EA_E0F066FD_E6D8_4ca9_84C3_D0C02AF09BF8__INCLUDED_)