* merge of changes from Christian

7 files changed, 114 insertions, 81 deletions

diff --git a/includes/audiomanagertypes.h b/includes/audiomanagertypes.h
index 6c39ad8..e0a6c21 100644
--- a/includes/audiomanagertypes.h
+++ b/includes/audiomanagertypes.h
@@ -22,8 +22,8 @@
 *

 * THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN

 */

-#if !defined(EA_C4520781_52CF_4636_BE82_37A28F483C93__INCLUDED_)

-#define EA_C4520781_52CF_4636_BE82_37A28F483C93__INCLUDED_

+#if !defined(EA_2D7F1C82_8717_47ce_B755_51DDED15BC18__INCLUDED_)

+#define EA_2D7F1C82_8717_47ce_B755_51DDED15BC18__INCLUDED_

 

 #include <stdint.h>

 #include "projecttypes.h"

@@ -124,56 +124,56 @@ namespace am {
 	 * After the buildup of a connection the first timing information needs to be sent within 5 seconds, the timing information from the routing adaptors need to be sent via 4 seconds. If the latency for a connection is variable and changes over lifetime of the connection, the routing adaptors shall resend the value and the audiomanger will correct the over all latency.\n
 	 * @author christian
 	 * @version 1.0
-	 * @created 26-Jan-2012 6:00:48 PM
+	 * @created 10-Feb-2012 1:31:00 PM
 	 */
 	typedef uint16_t am_domainID_t;
 
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 26-Jan-2012 6:00:48 PM
+	 * @created 10-Feb-2012 1:31:00 PM
 	 */
 	typedef uint16_t am_sourceID_t;
 
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 26-Jan-2012 6:00:48 PM
+	 * @created 10-Feb-2012 1:31:00 PM
 	 */
 	typedef uint16_t am_sinkID_t;
 
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 26-Jan-2012 6:00:48 PM
+	 * @created 10-Feb-2012 1:31:00 PM
 	 */
 	typedef uint16_t am_gatewayID_t;
 
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 26-Jan-2012 6:00:48 PM
+	 * @created 10-Feb-2012 1:31:00 PM
 	 */
 	typedef uint16_t am_crossfaderID_t;
 
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 26-Jan-2012 6:00:48 PM
+	 * @created 10-Feb-2012 1:31:00 PM
 	 */
 	typedef uint16_t am_connectionID_t;
 
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 26-Jan-2012 6:00:48 PM
+	 * @created 10-Feb-2012 1:31:00 PM
 	 */
 	typedef uint16_t am_mainConnectionID_t;
 
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 26-Jan-2012 6:00:48 PM
+	 * @created 10-Feb-2012 1:31:01 PM
 	 */
 	typedef uint16_t am_speed_t;
 
@@ -181,7 +181,7 @@ namespace am {
 	 * The unit is 0.1 db steps,The smallest value -3000 (=AM_MUTE). The minimum and maximum can be limited by actual project.
 	 * @author christian
 	 * @version 1.0
-	 * @created 26-Jan-2012 6:00:48 PM
+	 * @created 10-Feb-2012 1:31:01 PM
 	 */
 	typedef int16_t am_volume_t;
 
@@ -190,21 +190,21 @@ namespace am {
 	 * The range of this type is customer specific.
 	 * @author christian
 	 * @version 1.0
-	 * @created 26-Jan-2012 6:00:48 PM
+	 * @created 10-Feb-2012 1:31:01 PM
 	 */
 	typedef int16_t am_mainVolume_t;
 
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 26-Jan-2012 6:00:48 PM
+	 * @created 10-Feb-2012 1:31:01 PM
 	 */
 	typedef uint16_t am_sourceClass_t;
 
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 26-Jan-2012 6:00:48 PM
+	 * @created 10-Feb-2012 1:31:01 PM
 	 */
 	typedef uint16_t am_sinkClass_t;
 
@@ -212,7 +212,7 @@ namespace am {
 	 * time in ms!
 	 * @author christian
 	 * @version 1.0
-	 * @created 26-Jan-2012 6:00:48 PM
+	 * @created 10-Feb-2012 1:31:01 PM
 	 */
 	typedef uint16_t am_time_t;
 
@@ -220,7 +220,7 @@ namespace am {
 	 * offset time that is introduced in milli seconds.
 	 * @author christian
 	 * @version 1.0
-	 * @created 26-Jan-2012 6:00:48 PM
+	 * @created 10-Feb-2012 1:31:01 PM
 	 */
 	typedef int16_t am_timeSync_t;
 
@@ -228,7 +228,7 @@ namespace am {
 	 * with the help of this enum, sinks and sources can report their availability state
 	 * @author christian
 	 * @version 1.0
-	 * @created 26-Jan-2012 6:00:48 PM
+	 * @created 10-Feb-2012 1:31:01 PM
 	 */
 	enum am_Availablility_e
 	{
@@ -243,7 +243,7 @@ namespace am {
 	 * represents the connection state
 	 * @author christian
 	 * @version 1.0
-	 * @created 26-Jan-2012 6:00:48 PM
+	 * @created 10-Feb-2012 1:31:01 PM
 	 */
 	enum am_ConnectionState_e
 	{
@@ -274,7 +274,7 @@ namespace am {
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 26-Jan-2012 6:00:48 PM
+	 * @created 10-Feb-2012 1:31:01 PM
 	 */
 	enum am_DomainState_e
 	{
@@ -289,7 +289,7 @@ namespace am {
 	 * This enum characterizes the data of the EarlyData_t
 	 * @author christian
 	 * @version 1.0
-	 * @created 26-Jan-2012 6:00:48 PM
+	 * @created 10-Feb-2012 1:31:01 PM
 	 */
 	enum am_EarlyDataType_e
 	{
@@ -305,7 +305,7 @@ namespace am {
 	 * the errors of the audiomanager. All possible errors are in here. This enum is used widely as return parameter.
 	 * @author christian
 	 * @version 1.0
-	 * @created 26-Jan-2012 6:00:48 PM
+	 * @created 10-Feb-2012 1:31:01 PM
 	 */
 	enum am_Error_e
 	{
@@ -330,7 +330,7 @@ namespace am {
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 26-Jan-2012 6:00:48 PM
+	 * @created 10-Feb-2012 1:31:01 PM
 	 */
 	enum am_MuteState_e
 	{
@@ -344,7 +344,7 @@ namespace am {
 	 * The source state reflects the state of the source
 	 * @author christian
 	 * @version 1.0
-	 * @created 26-Jan-2012 6:00:48 PM
+	 * @created 10-Feb-2012 1:31:01 PM
 	 */
 	enum am_SourceState_e
 	{
@@ -368,7 +368,7 @@ namespace am {
 	 * This enumeration is used to define the type of the action that is correlated to a handle.
 	 * @author christian
 	 * @version 1.0
-	 * @created 26-Jan-2012 6:00:48 PM
+	 * @created 10-Feb-2012 1:31:01 PM
 	 */
 	enum am_Handle_e
 	{
@@ -389,7 +389,7 @@ namespace am {
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 26-Jan-2012 6:00:48 PM
+	 * @created 10-Feb-2012 1:31:01 PM
 	 */
 	enum am_InterruptState_e
 	{
@@ -403,7 +403,7 @@ namespace am {
 	 * describes the active sink of a crossfader.
 	 * @author christian
 	 * @version 1.0
-	 * @created 26-Jan-2012 6:00:49 PM
+	 * @created 10-Feb-2012 1:31:01 PM
 	 */
 	enum am_HotSink_e
 	{
@@ -418,7 +418,7 @@ namespace am {
 	 * this describes the availability of a sink or a source together with the latest change
 	 * @author christian
 	 * @version 1.0
-	 * @created 26-Jan-2012 6:00:49 PM
+	 * @created 10-Feb-2012 1:31:01 PM
 	 */
 	struct am_Availability_s
 	{
@@ -438,7 +438,7 @@ namespace am {
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 26-Jan-2012 6:00:49 PM
+	 * @created 10-Feb-2012 1:31:01 PM
 	 */
 	struct am_ClassProperty_s
 	{
@@ -452,7 +452,7 @@ namespace am {
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 26-Jan-2012 6:00:49 PM
+	 * @created 10-Feb-2012 1:31:01 PM
 	 */
 	struct am_Crossfader_s
 	{
@@ -470,7 +470,7 @@ namespace am {
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 26-Jan-2012 6:00:49 PM
+	 * @created 10-Feb-2012 1:31:01 PM
 	 */
 	struct am_Gateway_s
 	{
@@ -511,7 +511,7 @@ namespace am {
 	 * This represents one "hopp" in a route
 	 * @author christian
 	 * @version 1.0
-	 * @created 26-Jan-2012 6:00:49 PM
+	 * @created 10-Feb-2012 1:31:01 PM
 	 */
 	struct am_RoutingElement_s
 	{
@@ -527,7 +527,7 @@ namespace am {
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 26-Jan-2012 6:00:49 PM
+	 * @created 10-Feb-2012 1:31:02 PM
 	 */
 	struct am_Route_s
 	{
@@ -542,7 +542,7 @@ namespace am {
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 26-Jan-2012 6:00:49 PM
+	 * @created 10-Feb-2012 1:31:02 PM
 	 */
 	struct am_SoundProperty_s
 	{
@@ -556,7 +556,7 @@ namespace am {
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 26-Jan-2012 6:00:49 PM
+	 * @created 10-Feb-2012 1:31:02 PM
 	 */
 	struct am_SystemProperty_s
 	{
@@ -576,7 +576,7 @@ namespace am {
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 26-Jan-2012 6:00:50 PM
+	 * @created 10-Feb-2012 1:31:02 PM
 	 */
 	struct am_SinkClass_s
 	{
@@ -591,7 +591,7 @@ namespace am {
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 26-Jan-2012 6:00:50 PM
+	 * @created 10-Feb-2012 1:31:02 PM
 	 */
 	struct am_SourceClass_s
 	{
@@ -610,7 +610,7 @@ namespace am {
 	 * this type holds all information of sources relevant to the HMI
 	 * @author christian
 	 * @version 1.0
-	 * @created 26-Jan-2012 6:00:50 PM
+	 * @created 10-Feb-2012 1:31:02 PM
 	 */
 	struct am_SourceType_s
 	{
@@ -627,7 +627,7 @@ namespace am {
 	 * this type holds all information of sinks relevant to the HMI
 	 * @author christian
 	 * @version 1.0
-	 * @created 26-Jan-2012 6:00:50 PM
+	 * @created 10-Feb-2012 1:31:02 PM
 	 */
 	struct am_SinkType_s
 	{
@@ -645,7 +645,7 @@ namespace am {
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 26-Jan-2012 6:00:50 PM
+	 * @created 10-Feb-2012 1:31:03 PM
 	 */
 	struct am_Handle_s
 	{
@@ -659,7 +659,7 @@ namespace am {
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 26-Jan-2012 6:00:50 PM
+	 * @created 10-Feb-2012 1:31:03 PM
 	 */
 	struct am_MainSoundProperty_s
 	{
@@ -674,7 +674,7 @@ namespace am {
 	 * this type holds all information of connections relevant to the HMI
 	 * @author christian
 	 * @version 1.0
-	 * @created 26-Jan-2012 6:00:50 PM
+	 * @created 10-Feb-2012 1:31:03 PM
 	 */
 	struct am_MainConnectionType_s
 	{
@@ -691,23 +691,31 @@ namespace am {
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 26-Jan-2012 6:00:50 PM
+	 * @created 10-Feb-2012 1:31:03 PM
 	 */
 	struct am_MainConnection_s
 	{
 
 	public:
-		am_mainConnectionID_t connectionID;
+		am_mainConnectionID_t mainConnectionID;
 		am_ConnectionState_e connectionState;
-		am_Route_s route;
+		/**
+		 * the sinkID
+		 */
+		am_sinkID_t sinkID;
+		/**
+		 * the sourceID
+		 */
+		am_sourceID_t sourceID;
 		am_timeSync_t delay;
+		std::vector<am_connectionID_t> listConnectionID;
 
 	};
 
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 26-Jan-2012 6:00:51 PM
+	 * @created 10-Feb-2012 1:31:03 PM
 	 */
 	struct am_Sink_s
 	{
@@ -731,7 +739,7 @@ namespace am {
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 26-Jan-2012 6:00:51 PM
+	 * @created 10-Feb-2012 1:31:03 PM
 	 */
 	struct am_Source_s
 	{
@@ -764,7 +772,7 @@ namespace am {
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 26-Jan-2012 6:00:51 PM
+	 * @created 10-Feb-2012 1:31:03 PM
 	 */
 	struct am_Domain_s
 	{
@@ -783,7 +791,7 @@ namespace am {
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 26-Jan-2012 6:00:51 PM
+	 * @created 10-Feb-2012 1:31:04 PM
 	 */
 	struct am_Connection_s
 	{
@@ -803,7 +811,7 @@ namespace am {
 	 * soundProperty_t in case of ED_SOURCE_PROPERTY, ED_SINK_PROPERTY 
 	 * @author christian
 	 * @version 1.0
-	 * @created 26-Jan-2012 6:00:51 PM
+	 * @created 10-Feb-2012 1:31:04 PM
 	 */
 	union am_EarlyData_u
 	{
@@ -820,7 +828,7 @@ namespace am {
 	 * sinkID in case of ED_SINK_VOLUME, ED_SINK_PROPERTY 
 	 * @author christian
 	 * @version 1.0
-	 * @created 26-Jan-2012 6:00:51 PM
+	 * @created 10-Feb-2012 1:31:04 PM
 	 */
 	union am_DataType_u
 	{
@@ -834,7 +842,7 @@ namespace am {
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 26-Jan-2012 6:00:51 PM
+	 * @created 10-Feb-2012 1:31:04 PM
 	 */
 	struct am_EarlyData_s
 	{
@@ -846,4 +854,4 @@ namespace am {
 
 	};
 }
-#endif // !defined(EA_C4520781_52CF_4636_BE82_37A28F483C93__INCLUDED_)
+#endif // !defined(EA_2D7F1C82_8717_47ce_B755_51DDED15BC18__INCLUDED_)
diff --git a/includes/command/CommandReceiveInterface.h b/includes/command/CommandReceiveInterface.h
index 20e4455..257d5d9 100644
--- a/includes/command/CommandReceiveInterface.h
+++ b/includes/command/CommandReceiveInterface.h
@@ -22,8 +22,8 @@
 *

 * THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN

 */

-#if !defined(EA_6FE1E594_3CEA_4eaa_BAD0_7BB39D3150D2__INCLUDED_)

-#define EA_6FE1E594_3CEA_4eaa_BAD0_7BB39D3150D2__INCLUDED_

+#if !defined(EA_C6A85AF3_95A7_4c37_90ED_CA847BA7F31D__INCLUDED_)

+#define EA_C6A85AF3_95A7_4c37_90ED_CA847BA7F31D__INCLUDED_

 

 #include <vector>

 #include <string>

@@ -40,7 +40,7 @@ namespace am {
 	 * The interface towards the Controlling Instance (e.g HMI). It handles the communication towards the HMI and other system components who need to interact with the audiomanagement.
 	 * @author christian
 	 * @version 1.0
-	 * @created 26-Jan-2012 6:00:52 PM
+	 * @created 10-Feb-2012 1:31:04 PM
 	 */
 	class CommandReceiveInterface
 	{
@@ -204,4 +204,4 @@ namespace am {
 
 	};
 }
-#endif // !defined(EA_6FE1E594_3CEA_4eaa_BAD0_7BB39D3150D2__INCLUDED_)
+#endif // !defined(EA_C6A85AF3_95A7_4c37_90ED_CA847BA7F31D__INCLUDED_)
diff --git a/includes/command/CommandSendInterface.h b/includes/command/CommandSendInterface.h
index f1ec602..bd970d0 100644
--- a/includes/command/CommandSendInterface.h
+++ b/includes/command/CommandSendInterface.h
@@ -22,8 +22,8 @@
 *

 * THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN

 */

-#if !defined(EA_B298DDFD_7AC9_4a18_BB8C_595921C525B6__INCLUDED_)

-#define EA_B298DDFD_7AC9_4a18_BB8C_595921C525B6__INCLUDED_

+#if !defined(EA_1EBB5273_A222_43b8_B7C9_435405DF9AA2__INCLUDED_)

+#define EA_1EBB5273_A222_43b8_B7C9_435405DF9AA2__INCLUDED_

 

 #include <vector>

 #include <string>

@@ -41,7 +41,7 @@ namespace am {
 	 * This interface handles all communication from the AudioManagerDaemon towards the system. It is designed in such a way that only callbacks with no return types are implemented. So when the CommandInterfacePlugins are designed in such a way that they broadcast signals to any node who is interested in the particular information (like signals on Dbus for example), more information can be retrieved via the CommandReceiveInterface.
 	 * @author christian
 	 * @version 1.0
-	 * @created 26-Jan-2012 6:00:52 PM
+	 * @created 10-Feb-2012 1:31:05 PM
 	 */
 	class CommandSendInterface
 	{
@@ -165,4 +165,4 @@ namespace am {
 
 	};
 }
-#endif // !defined(EA_B298DDFD_7AC9_4a18_BB8C_595921C525B6__INCLUDED_)
+#endif // !defined(EA_1EBB5273_A222_43b8_B7C9_435405DF9AA2__INCLUDED_)
diff --git a/includes/control/ControlReceiveInterface.h b/includes/control/ControlReceiveInterface.h
index 4a2334c..d01327b 100644
--- a/includes/control/ControlReceiveInterface.h
+++ b/includes/control/ControlReceiveInterface.h
@@ -22,8 +22,8 @@
 *

 * THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN

 */

-#if !defined(EA_9550F257_23AE_4781_B149_0E4B3A9889AC__INCLUDED_)

-#define EA_9550F257_23AE_4781_B149_0E4B3A9889AC__INCLUDED_

+#if !defined(EA_C0D10ABE_48CA_4a18_9932_CB970D9C3723__INCLUDED_)

+#define EA_C0D10ABE_48CA_4a18_9932_CB970D9C3723__INCLUDED_

 

 #include <vector>

 #include <string>

@@ -39,7 +39,7 @@ namespace am {
 	 * This interface gives access to all important functions of the audiomanager that are used by the AudioManagerController to control the system.
 	 * @author christian
 	 * @version 1.0
-	 * @created 26-Jan-2012 6:00:52 PM
+	 * @created 10-Feb-2012 1:31:05 PM
 	 */
 	class ControlReceiveInterface
 	{
@@ -278,9 +278,9 @@ namespace am {
 		 * @return E_OK on success, E_DATABASE_ERROR on error, E_NON_EXISTENT if mainconnection
 		 * 
 		 * @param mainconnectionID
-		 * @param route
+		 * @param listConnectionID
 		 */
-		virtual am_Error_e changeMainConnectionRouteDB(const am_mainConnectionID_t mainconnectionID, const am_Route_s& route) =0;
+		virtual am_Error_e changeMainConnectionRouteDB(const am_mainConnectionID_t mainconnectionID, const std::vector<am_connectionID_t>& listConnectionID) =0;
 		/**
 		 * changes the mainConnectionState of MainConnection

 		 * @return E_OK on success, E_DATABASE_ERROR on error, E_NON_EXISTENT if mainconnection
@@ -425,6 +425,22 @@ namespace am {
 		 */
 		virtual am_Error_e getSinkClassInfoDB(const am_sinkID_t sinkID, am_SinkClass_s& sinkClass) const =0;
 		/**
+		 * returns the sinkData of a sink

+		 * @return E_OK on success, E_DATABASE_ERROR on error, E_NON_EXISTENT if sink was not found
+		 * 
+		 * @param sinkID
+		 * @param sinkData
+		 */
+		virtual am_Error_e getSinkInfoDB(const am_sinkID_t sinkID, am_Sink_s& sinkData) const =0;
+		/**
+		 * returns the sourcekData of a source

+		 * @return E_OK on success, E_DATABASE_ERROR on error, E_NON_EXISTENT if sink was not found
+		 * 
+		 * @param sourceID
+		 * @param sourceData
+		 */
+		virtual am_Error_e getSourceInfoDB(const am_sourceID_t sourceID, am_Source_s& sourceData) const =0;
+		/**
 		 * return source and sink of a gateway

 		 * @return E_OK on success, E_DATABASE_ERROR on error, E_NON_EXISTENT if gateway was not found
 		 * 
@@ -441,6 +457,14 @@ namespace am {
 		 */
 		virtual am_Error_e getCrossfaderInfoDB(const am_crossfaderID_t crossfaderID, am_Crossfader_s& crossfaderData) const =0;
 		/**
+		 * returns sources and the sink of a crossfader

+		 * @return E_OK on success, E_DATABASE_ERROR on error, E_NON_EXISTENT if crossfader was not found
+		 * 
+		 * @param mainConnectionID
+		 * @param mainConnectionData
+		 */
+		virtual am_Error_e getMainConnectionInfoDB(const am_mainConnectionID_t mainConnectionID, am_MainConnection_s& mainConnectionData) const =0;
+		/**
 		 * returns all sinks of a domain

 		 * @return E_OK on success, E_DATABASE_ERROR on error, E_NON_EXISTENT if domain was not found
 		 * 
@@ -570,4 +594,4 @@ namespace am {
 
 	};
 }
-#endif // !defined(EA_9550F257_23AE_4781_B149_0E4B3A9889AC__INCLUDED_)
+#endif // !defined(EA_C0D10ABE_48CA_4a18_9932_CB970D9C3723__INCLUDED_)
diff --git a/includes/control/ControlSendInterface.h b/includes/control/ControlSendInterface.h
index 401d176..2d49593 100644
--- a/includes/control/ControlSendInterface.h
+++ b/includes/control/ControlSendInterface.h
@@ -22,8 +22,8 @@
 *

 * THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN

 */

-#if !defined(EA_7C94464D_AE95_434a_A108_201C19F97A85__INCLUDED_)

-#define EA_7C94464D_AE95_434a_A108_201C19F97A85__INCLUDED_

+#if !defined(EA_F931365D_53A0_4830_8B3E_29C95C767ADC__INCLUDED_)

+#define EA_F931365D_53A0_4830_8B3E_29C95C767ADC__INCLUDED_

 

 #include <vector>

 #include <string>

@@ -40,7 +40,7 @@ namespace am {
 	 * All the hooks represent system events that need to be handled. The callback functions are used to handle for example answers to function calls on the AudioManagerCoreInterface.
 	 * @author christian
 	 * @version 1.0
-	 * @created 26-Jan-2012 6:00:53 PM
+	 * @created 10-Feb-2012 1:31:06 PM
 	 */
 	class ControlSendInterface
 	{
@@ -367,4 +367,4 @@ namespace am {
 
 	};
 }
-#endif // !defined(EA_7C94464D_AE95_434a_A108_201C19F97A85__INCLUDED_)
+#endif // !defined(EA_F931365D_53A0_4830_8B3E_29C95C767ADC__INCLUDED_)
diff --git a/includes/routing/RoutingReceiveInterface.h b/includes/routing/RoutingReceiveInterface.h
index c2438a9..00e4666 100644
--- a/includes/routing/RoutingReceiveInterface.h
+++ b/includes/routing/RoutingReceiveInterface.h
@@ -22,8 +22,8 @@
 *

 * THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN

 */

-#if !defined(EA_21C9D5F3_73BF_4121_9A14_1D76799A05A0__INCLUDED_)

-#define EA_21C9D5F3_73BF_4121_9A14_1D76799A05A0__INCLUDED_

+#if !defined(EA_C1FDE688_5CB0_42b2_B2CC_C407D50C2D87__INCLUDED_)

+#define EA_C1FDE688_5CB0_42b2_B2CC_C407D50C2D87__INCLUDED_

 

 #include <vector>

 #include <string>

@@ -41,7 +41,7 @@ namespace am {
 	 * Routing Receive sendInterface description. This class implements everything from RoutingAdapter -> Audiomanager
 	 * @author christian
 	 * @version 1.0
-	 * @created 01-Feb-2012 9:42:02 AM
+	 * @created 10-Feb-2012 1:31:06 PM
 	 */
 	class RoutingReceiveInterface
 	{
@@ -248,7 +248,7 @@ namespace am {
 		virtual am_Error_e deregisterCrossfader(const am_crossfaderID_t crossfaderID) =0;
 		/**
 		 * this function peeks a sourceclassID. It is used by the RoutingPlugins to determine the SinkClassIDs of a sinkClass.

-		 * @return E_OK on succes, E_DATABASE_ERROR on error, E_NON_EXISTENT if no sourceclass with name is registered
+		 * @return E_OK on succes, E_DATABASE_ERROR on error
 		 * 
 		 * @param name
 		 * @param sourceClassID
@@ -256,7 +256,7 @@ namespace am {
 		virtual am_Error_e peekSourceClassID(const std::string& name, am_sourceClass_t& sourceClassID) =0;
 		/**
 		 * this function peeks a sourceclassID. It is used by the RoutingPlugins to determine the SinkClassIDs of a sinkClass.

-		 * @return E_OK on succes, E_DATABASE_ERROR on error, E_NON_EXISTENT if no sourceclass with name is registered
+		 * @return E_OK on succes, E_DATABASE_ERROR on error
 		 * 
 		 * @param name
 		 * @param sinkClassID
@@ -305,7 +305,8 @@ namespace am {
 		 */
 		virtual void hookTimingInformationChanged(const am_connectionID_t connectionID, const am_timeSync_t delay) =0;
 		/**
-		 * this function is used to send out all data that has been changed in an early state.
+		 * this function is used to send out all data that has been changed in an early state.

+		 * @return E_OK on success, E_UNKNOWN on error
 		 * 
 		 * @param earlyData
 		 */
@@ -331,4 +332,4 @@ namespace am {
 
 	};
 }
-#endif // !defined(EA_21C9D5F3_73BF_4121_9A14_1D76799A05A0__INCLUDED_)
+#endif // !defined(EA_C1FDE688_5CB0_42b2_B2CC_C407D50C2D87__INCLUDED_)
diff --git a/includes/routing/RoutingSendInterface.h b/includes/routing/RoutingSendInterface.h
index 6c73d4e..35c07cd 100644
--- a/includes/routing/RoutingSendInterface.h
+++ b/includes/routing/RoutingSendInterface.h
@@ -22,8 +22,8 @@
 *

 * THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN

 */

-#if !defined(EA_A00AD21A_AC6F_456e_B4DC_9C6AF4F44C3D__INCLUDED_)

-#define EA_A00AD21A_AC6F_456e_B4DC_9C6AF4F44C3D__INCLUDED_

+#if !defined(EA_E1ED14D4_6A57_4661_8587_FA302E2A9951__INCLUDED_)

+#define EA_E1ED14D4_6A57_4661_8587_FA302E2A9951__INCLUDED_

 

 #include <vector>

 #include <string>

@@ -41,7 +41,7 @@ namespace am {
 	 *  This class implements everything from Audiomanager -> RoutingAdapter
 	 * @author christian
 	 * @version 1.0
-	 * @created 01-Feb-2012 9:42:02 AM
+	 * @created 10-Feb-2012 1:31:06 PM
 	 */
 	class RoutingSendInterface
 	{
@@ -196,4 +196,4 @@ namespace am {
 
 	};
 }
-#endif // !defined(EA_A00AD21A_AC6F_456e_B4DC_9C6AF4F44C3D__INCLUDED_)
+#endif // !defined(EA_E1ED14D4_6A57_4661_8587_FA302E2A9951__INCLUDED_)