* [GAM-29] fixes

3 files changed, 373 insertions, 216 deletions

diff --git a/include/control/IAmControlReceive.h b/include/control/IAmControlReceive.h
index fe899ba..1cbf244 100644
--- a/include/control/IAmControlReceive.h
+++ b/include/control/IAmControlReceive.h
@@ -19,8 +19,8 @@
  *

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

  */

-#if !defined(EA_FC4DEA6F_95C3_409f_83CE_63BF9A997339__INCLUDED_)

-#define EA_FC4DEA6F_95C3_409f_83CE_63BF9A997339__INCLUDED_

+#if !defined(EA_6E701C15_A8E8_4ad3_A50B_D91A5BD0973F__INCLUDED_)

+#define EA_6E701C15_A8E8_4ad3_A50B_D91A5BD0973F__INCLUDED_

 

 #include <vector>

 #include <string>

@@ -33,16 +33,21 @@ class CAmSocketHandler;
 #define ControlReceiveVersion "1.0" 
 namespace am {
 	/**
-	 * This interface gives access to all important functions of the audiomanager that are used by the AudioManagerController to control the system.

-	 * There are two rules that have to be kept in mind when implementing against this interface:\n

-	 * \warning

-	 * 1. CALLS TO THIS INTERFACE ARE NOT THREAD SAFE !!!! \n

-	 * 2. YOU MAY NOT THE CALLING INTERFACE DURING AN SYNCHRONOUS OR ASYNCHRONOUS CALL THAT EXPECTS A RETURN VALUE.\n

-	 * \details

-	 * Violation these rules may lead to unexpected behavior! Nevertheless you can implement thread safe by using the deferred-call pattern described on the wiki which also helps to implement calls that are forbidden.\n

+	 * This interface gives access to all important functions of the audiomanager that
+	 * are used by the AudioManagerController to control the system.
+	 * There are two rules that have to be kept in mind when implementing against this
+	 * interface:\n
+	 * \warning
+	 * 1. CALLS TO THIS INTERFACE ARE NOT THREAD SAFE !!!! \n
+	 * 2. YOU MAY NOT CALL THE CALLING INTERFACE DURING AN SYNCHRONOUS OR ASYNCHRONOUS
+	 * CALL THAT EXPECTS A RETURN VALUE.\n
+	 * \details
+	 * Violation these rules may lead to unexpected behavior! Nevertheless you can
+	 * implement thread safe by using the deferred-call pattern described on the wiki
+	 * which also helps to implement calls that are forbidden.\n
 	 * For more information, please check CAmSerializer
 	 * @author Christian Mueller
-	 * @created 06-Mar-2012 8:01:07 PM
+	 * @created 07-Mar-2012 6:06:18 PM
 	 */
 	class IAmControlReceive
 	{
@@ -57,19 +62,29 @@ namespace am {
 		}
 
 		/**
-		 * calculates a route from source to sink.

+		 * This function returns the version of the interface
+		 * 
+		 * @param version
+		 */
+		virtual void getInterfaceVersion(std::string& version) const =0;
+		/**
+		 * calculates a route from source to sink.
 		 * @return E_OK on success, E_UNKNOWN on error
 		 * 
-		 * @param onlyfree    if true return only routes which use gateways that are not in use at the moment
+		 * @param onlyfree    if true return only routes which use gateways that are not
+		 * in use at the moment
 		 * @param sourceID
 		 * @param sinkID
-		 * @param returnList    this is a list of routes that are possible to take. unsorted! The longest could be first.

+		 * @param returnList    this is a list of routes that are possible to take.
+		 * unsorted! The longest could be first.
 		 * In case not route can be found, the list will return empty.
 		 */
 		virtual am_Error_e getRoute(const bool onlyfree, const am_sourceID_t sourceID, const am_sinkID_t sinkID, std::vector<am_Route_s>& returnList) =0;
 		/**
-		 * With this function, elementary connects can be triggered by the controller.

-		 * @return E_OK on success, E_UNKNOWN on error, E_WRONG_FORMAT of connectionFormats do not match, E_NO_CHANGE if the desired connection is already build up
+		 * With this function, elementary connects can be triggered by the controller.
+		 * @return E_OK on success, E_UNKNOWN on error, E_WRONG_FORMAT of
+		 * connectionFormats do not match, E_NO_CHANGE if the desired connection is
+		 * already build up
 		 * 
 		 * @param handle
 		 * @param connectionID
@@ -79,34 +94,39 @@ namespace am {
 		 */
 		virtual am_Error_e connect(am_Handle_s& handle, am_connectionID_t& connectionID, const am_ConnectionFormat_e format, const am_sourceID_t sourceID, const am_sinkID_t sinkID) =0;
 		/**
-		 * is used to disconnect a connection

-		 * @return E_OK on success, E_UNKNOWN on error, E_NON_EXISTENT if connection was not found, E_NO_CHANGE if no change is neccessary
+		 * is used to disconnect a connection
+		 * @return E_OK on success, E_UNKNOWN on error, E_NON_EXISTENT if connection was
+		 * not found, E_NO_CHANGE if no change is neccessary
 		 * 
 		 * @param handle
 		 * @param connectionID
 		 */
 		virtual am_Error_e disconnect(am_Handle_s& handle, const am_connectionID_t connectionID) =0;
 		/**
-		 * triggers a cross fade.

-		 * @return E_OK on success, E_UNKNOWN on error E_NO_CHANGE if no change is neccessary
+		 * triggers a cross fade.
+		 * @return E_OK on success, E_UNKNOWN on error E_NO_CHANGE if no change is
+		 * neccessary
 		 * 
 		 * @param handle
-		 * @param hotSource    this is the source that is going to be the active one after the fading
+		 * @param hotSource    this is the source that is going to be the active one after
+		 * the fading
 		 * @param crossfaderID
 		 * @param rampType
 		 * @param rampTime    rampTime 0 means default value
 		 */
 		virtual am_Error_e crossfade(am_Handle_s& handle, const am_HotSink_e hotSource, const am_crossfaderID_t crossfaderID, const am_RampType_e rampType, const am_time_t rampTime) =0;
 		/**
-		 * with this method, all actions that have a handle assigned can be stopped.

+		 * with this method, all actions that have a handle assigned can be stopped.
 		 * @return E_OK on success, E_UNKNOWN on error
 		 * 
 		 * @param handle    the handle of the action to be stopped
 		 */
 		virtual am_Error_e abortAction(const am_Handle_s handle) =0;
 		/**
-		 * this method sets a source state for a source. This function will trigger the callback cbAckSetSourceState

-		 * @return E_OK on success, E_NO_CHANGE if the desired value is already correct, E_UNKNOWN on error, E_NO_CHANGE if no change is neccessary 
+		 * this method sets a source state for a source. This function will trigger the
+		 * callback cbAckSetSourceState
+		 * @return E_OK on success, E_NO_CHANGE if the desired value is already correct,
+		 * E_UNKNOWN on error, E_NO_CHANGE if no change is neccessary
 		 * 
 		 * @param handle
 		 * @param sourceID
@@ -114,9 +134,13 @@ namespace am {
 		 */
 		virtual am_Error_e setSourceState(am_Handle_s& handle, const am_sourceID_t sourceID, const am_SourceState_e state) =0;
 		/**
-		 * with this function, setting of sinks volumes is done. The behavior of the volume set is depended on the given ramp and time information.

-		 * This function is not only used to ramp volume, but also to mute and direct set the level. Exact behavior is depended on the selected mute ramps.

-		 * @return E_OK on success, E_NO_CHANGE if the volume is already on the desired value, E_OUT_OF_RANGE is the volume is out of range, E_UNKNOWN on every other error.
+		 * with this function, setting of sinks volumes is done. The behavior of the
+		 * volume set is depended on the given ramp and time information.
+		 * This function is not only used to ramp volume, but also to mute and direct set
+		 * the level. Exact behavior is depended on the selected mute ramps.
+		 * @return E_OK on success, E_NO_CHANGE if the volume is already on the desired
+		 * value, E_OUT_OF_RANGE is the volume is out of range, E_UNKNOWN on every other
+		 * error.
 		 * 
 		 * @param handle
 		 * @param sinkID
@@ -126,9 +150,13 @@ namespace am {
 		 */
 		virtual am_Error_e setSinkVolume(am_Handle_s& handle, const am_sinkID_t sinkID, const am_volume_t volume, const am_RampType_e ramp, const am_time_t time) =0;
 		/**
-		 * with this function, setting of source volumes is done. The behavior of the volume set is depended on the given ramp and time information.

-		 * This function is not only used to ramp volume, but also to mute and direct set the level. Exact behavior is depended on the selected mute ramps.

-		 * @return E_OK on success, E_NO_CHANGE if the volume is already on the desired value, E_OUT_OF_RANGE is the volume is out of range, E_UNKNOWN on every other error.
+		 * with this function, setting of source volumes is done. The behavior of the
+		 * volume set is depended on the given ramp and time information.
+		 * This function is not only used to ramp volume, but also to mute and direct set
+		 * the level. Exact behavior is depended on the selected mute ramps.
+		 * @return E_OK on success, E_NO_CHANGE if the volume is already on the desired
+		 * value, E_OUT_OF_RANGE is the volume is out of range, E_UNKNOWN on every other
+		 * error.
 		 * 
 		 * @param handle
 		 * @param sourceID
@@ -138,8 +166,9 @@ namespace am {
 		 */
 		virtual am_Error_e setSourceVolume(am_Handle_s& handle, const am_sourceID_t sourceID, const am_volume_t volume, const am_RampType_e rampType, const am_time_t time) =0;
 		/**
-		 * is used to set several sinkSoundProperties at a time

-		 * @return E_OK on success, E_UNKNOWN on error, E_OUT_OF_RANGE  if property is out of range, E_NO_CHANGE if no change is neccessary
+		 * is used to set several sinkSoundProperties at a time
+		 * @return E_OK on success, E_UNKNOWN on error, E_OUT_OF_RANGE  if property is out
+		 * of range, E_NO_CHANGE if no change is neccessary
 		 * 
 		 * @param handle
 		 * @param sinkID
@@ -147,8 +176,9 @@ namespace am {
 		 */
 		virtual am_Error_e setSinkSoundProperties(am_Handle_s& handle, const am_sinkID_t sinkID, const std::vector<am_SoundProperty_s>& soundProperty) =0;
 		/**
-		 * is used to set sinkSoundProperties

-		 * @return E_OK on success, E_UNKNOWN on error, E_OUT_OF_RANGE  if property is out of range, E_NO_CHANGE if no change is neccessary
+		 * is used to set sinkSoundProperties
+		 * @return E_OK on success, E_UNKNOWN on error, E_OUT_OF_RANGE  if property is out
+		 * of range, E_NO_CHANGE if no change is neccessary
 		 * 
 		 * @param handle
 		 * @param sinkID
@@ -156,8 +186,9 @@ namespace am {
 		 */
 		virtual am_Error_e setSinkSoundProperty(am_Handle_s& handle, const am_sinkID_t sinkID, const am_SoundProperty_s& soundProperty) =0;
 		/**
-		 * is used to set several SourceSoundProperties at a time

-		 * @return E_OK on success, E_UNKNOWN on error, E_OUT_OF_RANGE  if property is out of range. E_NO_CHANGE if no change is neccessary
+		 * is used to set several SourceSoundProperties at a time
+		 * @return E_OK on success, E_UNKNOWN on error, E_OUT_OF_RANGE  if property is out
+		 * of range. E_NO_CHANGE if no change is neccessary
 		 * 
 		 * @param handle
 		 * @param sourceID
@@ -165,8 +196,9 @@ namespace am {
 		 */
 		virtual am_Error_e setSourceSoundProperties(am_Handle_s& handle, const am_sourceID_t sourceID, const std::vector<am_SoundProperty_s>& soundProperty) =0;
 		/**
-		 * is used to set sourceSoundProperties

-		 * @return E_OK on success, E_UNKNOWN on error, E_OUT_OF_RANGE  if property is out of range. E_NO_CHANGE if no change is neccessary
+		 * is used to set sourceSoundProperties
+		 * @return E_OK on success, E_UNKNOWN on error, E_OUT_OF_RANGE  if property is out
+		 * of range. E_NO_CHANGE if no change is neccessary
 		 * 
 		 * @param handle
 		 * @param sourceID
@@ -174,396 +206,470 @@ namespace am {
 		 */
 		virtual am_Error_e setSourceSoundProperty(am_Handle_s& handle, const am_sourceID_t sourceID, const am_SoundProperty_s& soundProperty) =0;
 		/**
-		 * sets the domain state of a domain

-		 * @return E_OK on success, E_UNKNOWN on error, E_NO_CHANGE if no change is neccessary
+		 * sets the domain state of a domain
+		 * @return E_OK on success, E_UNKNOWN on error, E_NO_CHANGE if no change is
+		 * neccessary
 		 * 
 		 * @param domainID
 		 * @param domainState
 		 */
 		virtual am_Error_e setDomainState(const am_domainID_t domainID, const am_DomainState_e domainState) =0;
 		/**
-		 * enters a domain in the database, creates and ID

-		 * @return E_OK on success, E_ALREADY_EXISTENT if the ID or name is already in the database, E_DATABASE_ERROR if the database had an error
+		 * enters a domain in the database, creates and ID
+		 * @return E_OK on success, E_ALREADY_EXISTENT if the ID or name is already in the
+		 * database, E_DATABASE_ERROR if the database had an error
 		 * 
 		 * @param domainData    domainID in am_Domain_s must be 0 here
 		 * @param domainID
 		 */
 		virtual am_Error_e enterDomainDB(const am_Domain_s& domainData, am_domainID_t& domainID) =0;
 		/**
-		 * enters a mainconnection in the database, creates and ID

+		 * enters a mainconnection in the database, creates and ID
 		 * @return E_OK on success, E_DATABASE_ERROR if the database had an error
 		 * 
-		 * @param mainConnectionData    the MainConnectionID is omitted since it is created during the registration
+		 * @param mainConnectionData    the MainConnectionID is omitted since it is
+		 * created during the registration
 		 * @param connectionID
 		 */
 		virtual am_Error_e enterMainConnectionDB(const am_MainConnection_s& mainConnectionData, am_mainConnectionID_t& connectionID) =0;
 		/**
-		 * enters a sink in the database.

-		 * The sinkID in am_Sink_s shall be 0 in case of a dynamic added source A sinkID greater than 100 will be assigned. If a specific sinkID with a value <100 is given, the given value will be used. This is for a static setup where the ID's are predefined.

-		 * @return E_OK on success, E_ALREADY_EXISTENT if the ID or name is already in the database, E_DATABASE_ERROR if the database had an error
+		 * enters a sink in the database.
+		 * The sinkID in am_Sink_s shall be 0 in case of a dynamic added source A sinkID
+		 * greater than 100 will be assigned. If a specific sinkID with a value <100 is
+		 * given, the given value will be used. This is for a static setup where the ID's
+		 * are predefined.
+		 * @return E_OK on success, E_ALREADY_EXISTENT if the ID or name is already in the
+		 * database, E_DATABASE_ERROR if the database had an error
 		 * 
-		 * @param sinkData    the sinkID will be omitted since it is created during the registration
+		 * @param sinkData    the sinkID will be omitted since it is created during the
+		 * registration
 		 * @param sinkID
 		 */
 		virtual am_Error_e enterSinkDB(const am_Sink_s& sinkData, am_sinkID_t& sinkID) =0;
 		/**
-		 * enters a crossfader in the database.

-		 * The crossfaderID in am_Crossfader_s shall be 0 in case of a dynamic added source A crossfaderID greater than 100 will be assigned. If a specific crossfaderID with a value <100 is given, the given value will be used. This is for a static setup where the ID's are predefined.

-		 * @return E_OK on success, E_ALREADY_EXISTENT if the ID or name is already in the database, E_DATABASE_ERROR if the database had an error
+		 * enters a crossfader in the database.
+		 * The crossfaderID in am_Crossfader_s shall be 0 in case of a dynamic added
+		 * source A crossfaderID greater than 100 will be assigned. If a specific
+		 * crossfaderID with a value <100 is given, the given value will be used. This is
+		 * for a static setup where the ID's are predefined.
+		 * @return E_OK on success, E_ALREADY_EXISTENT if the ID or name is already in the
+		 * database, E_DATABASE_ERROR if the database had an error
 		 * 
-		 * @param crossfaderData    the ID in the data will be ignored since it is created during the registration
+		 * @param crossfaderData    the ID in the data will be ignored since it is created
+		 * during the registration
 		 * @param crossfaderID
 		 */
 		virtual am_Error_e enterCrossfaderDB(const am_Crossfader_s& crossfaderData, am_crossfaderID_t& crossfaderID) =0;
 		/**
-		 * enters a gateway in the database.

-		 * The gatewayID in am_Gateway_s shall be 0 in case of a dynamic added source A gatewayID greater than 100 will be assigned. If a specific gatewayID with a value <100 is given, the given value will be used. This is for a static setup where the ID's are predefined.

-		 * @return E_OK on success, E_ALREADY_EXISTENT if the ID or name is already in the database, E_DATABASE_ERROR if the database had an error
-		 * 
-		 * @param gatewayData    In a fixed setup, the gatewayID must be below 100. In a dynamic setup, the gatewayID shall be 0! listSourceFormats and listSinkFormats are empty at registration time. Values are taken over when sources and sinks are registered.
+		 * enters a gateway in the database.
+		 * The gatewayID in am_Gateway_s shall be 0 in case of a dynamic added source A
+		 * gatewayID greater than 100 will be assigned. If a specific gatewayID with a
+		 * value <100 is given, the given value will be used. This is for a static setup
+		 * where the ID's are predefined.
+		 * @return E_OK on success, E_ALREADY_EXISTENT if the ID or name is already in the
+		 * database, E_DATABASE_ERROR if the database had an error
+		 * 
+		 * @param gatewayData    In a fixed setup, the gatewayID must be below 100. In a
+		 * dynamic setup, the gatewayID shall be 0! listSourceFormats and listSinkFormats
+		 * are empty at registration time. Values are taken over when sources and sinks
+		 * are registered.
 		 * @param gatewayID
 		 */
 		virtual am_Error_e enterGatewayDB(const am_Gateway_s& gatewayData, am_gatewayID_t& gatewayID) =0;
 		/**
-		 * enters a source in the database.

-		 * The sourceID in am_Source_s shall be 0 in case of a dynamic added source A sourceID greater than 100 will be assigned. If a specific sourceID with a value <100 is given, the given value will be used. This is for a static setup where the ID's are predefined.

-		 * @return E_OK on success, E_ALREADY_EXISTENT if the ID or name is already in the database, E_DATABASE_ERROR if the database had an error
+		 * enters a source in the database.
+		 * The sourceID in am_Source_s shall be 0 in case of a dynamic added source A
+		 * sourceID greater than 100 will be assigned. If a specific sourceID with a value
+		 * <100 is given, the given value will be used. This is for a static setup where
+		 * the ID's are predefined.
+		 * @return E_OK on success, E_ALREADY_EXISTENT if the ID or name is already in the
+		 * database, E_DATABASE_ERROR if the database had an error
 		 * 
-		 * @param sourceData    sourceID is omitted here since it is created during registration
+		 * @param sourceData    sourceID is omitted here since it is created during
+		 * registration
 		 * @param sourceID
 		 */
 		virtual am_Error_e enterSourceDB(const am_Source_s& sourceData, am_sourceID_t& sourceID) =0;
 		/**
-		 * Enters a sourceClass into the database.

-		 * @return E_OK on success, E_ALREADY_EXISTENT if the ID or name is already in the database, E_DATABASE_ERROR if the database had an error
+		 * Enters a sourceClass into the database.
+		 * @return E_OK on success, E_ALREADY_EXISTENT if the ID or name is already in the
+		 * database, E_DATABASE_ERROR if the database had an error
 		 * 
-		 * @param sinkClass    IDs given with the SinkCLassID are valid below 100 (static). If given as 0, sinkClass will be enterd dynamic and ID above 100 will be created.
+		 * @param sinkClass    IDs given with the SinkCLassID are valid below 100 (static).
+		 * If given as 0, sinkClass will be enterd dynamic and ID above 100 will be
+		 * created.
 		 * @param sinkClassID
 		 */
 		virtual am_Error_e enterSinkClassDB(const am_SinkClass_s& sinkClass, am_sinkClass_t& sinkClassID) =0;
 		/**
-		 * Enters a sourceClass into the database.

-		 * The sourceClassID in am_sourceClass_s shall be 0 in case of a dynamic added source A sourceClassID greater than 100 will be assigned. If a specific sourceClassID with a value <100 is given, the given value will be used. This is for a static setup where the ID's are predefined.

-		 * @return E_OK on success, E_ALREADY_EXISTENT if the ID or name is already in the database, E_DATABASE_ERROR if the database had an error
+		 * Enters a sourceClass into the database.
+		 * The sourceClassID in am_sourceClass_s shall be 0 in case of a dynamic added
+		 * source A sourceClassID greater than 100 will be assigned. If a specific
+		 * sourceClassID with a value <100 is given, the given value will be used. This is
+		 * for a static setup where the ID's are predefined.
+		 * @return E_OK on success, E_ALREADY_EXISTENT if the ID or name is already in the
+		 * database, E_DATABASE_ERROR if the database had an error
 		 * 
 		 * @param sourceClassID
-		 * @param sourceClass    IDs given with the SourceCLassID are valid below 100 (static). If given as 0, sourceClass will be enterd dynamic and ID above 100 will be created.
+		 * @param sourceClass    IDs given with the SourceCLassID are valid below 100
+		 * (static). If given as 0, sourceClass will be enterd dynamic and ID above 100
+		 * will be created.
 		 */
 		virtual am_Error_e enterSourceClassDB(am_sourceClass_t& sourceClassID, const am_SourceClass_s& sourceClass) =0;
 		/**
-		 * changes class information of a sinkclass.

-		 * The properties will overwrite the values of the sinkClassID given in the sinkClass.

-		 * It is the duty of the controller to check if the property is valid. If it does not exist, the daemon will not return an error.

-		 * @return E_OK on success, E_DATABASE_ERROR on error, E_NON_EXISTENT if sinkClassID was not found. 
+		 * changes class information of a sinkclass.
+		 * The properties will overwrite the values of the sinkClassID given in the
+		 * sinkClass.
+		 * It is the duty of the controller to check if the property is valid. If it does
+		 * not exist, the daemon will not return an error.
+		 * @return E_OK on success, E_DATABASE_ERROR on error, E_NON_EXISTENT if
+		 * sinkClassID was not found.
 		 * 
-		 * @param sinkClass    if a SourceClass ID other than 0 is given, the classInformation replaces the existing one. In case of ClassID 0, a new classID is created and returned
+		 * @param sinkClass    if a SourceClass ID other than 0 is given, the
+		 * classInformation replaces the existing one. In case of ClassID 0, a new classID
+		 * is created and returned
 		 */
 		virtual am_Error_e changeSinkClassInfoDB(const am_SinkClass_s& sinkClass) =0;
 		/**
-		 * changes class information of a sourceClass. 

-		 * The properties will overwrite the values of the sourceClassID given in the sourceClass.

-		 * It is the duty of the controller to check if the property is valid. If it does not exist, the daemon will not return an error.

-		 * @return E_OK on success, E_DATABASE_ERROR on error and E_NON_EXISTENT if the ClassID does not exist.
+		 * changes class information of a sourceClass.
+		 * The properties will overwrite the values of the sourceClassID given in the
+		 * sourceClass.
+		 * It is the duty of the controller to check if the property is valid. If it does
+		 * not exist, the daemon will not return an error.
+		 * @return E_OK on success, E_DATABASE_ERROR on error and E_NON_EXISTENT if the
+		 * ClassID does not exist.
 		 * 
-		 * @param sourceClass    if a SourceClass ID other than 0 is given, the classInformation replaces the existing one. In case of ClassID 0, a new classID is created and returned
+		 * @param sourceClass    if a SourceClass ID other than 0 is given, the
+		 * classInformation replaces the existing one. In case of ClassID 0, a new classID
+		 * is created and returned
 		 */
 		virtual am_Error_e changeSourceClassInfoDB(const am_SourceClass_s& sourceClass) =0;
 		/**
-		 * This function is used to enter the system Properties into the database.

-		 * All entries in the database will be erased before entering the new List. It should only be called once at system startup.

+		 * This function is used to enter the system Properties into the database.
+		 * All entries in the database will be erased before entering the new List. It
+		 * should only be called once at system startup.
 		 * @return E_OK on success,  E_DATABASE_ERROR if the database had an error
 		 * 
 		 * @param listSystemProperties
 		 */
 		virtual am_Error_e enterSystemPropertiesListDB(const std::vector<am_SystemProperty_s>& listSystemProperties) =0;
 		/**
-		 * changes the mainConnectionState of MainConnection

-		 * @return E_OK on success, E_DATABASE_ERROR on error, E_NON_EXISTENT if mainconnection
+		 * changes the mainConnectionState of MainConnection
+		 * @return E_OK on success, E_DATABASE_ERROR on error, E_NON_EXISTENT if
+		 * mainconnection
 		 * 
 		 * @param mainconnectionID
 		 * @param listConnectionID
 		 */
 		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
+		 * changes the mainConnectionState of MainConnection
+		 * @return E_OK on success, E_DATABASE_ERROR on error, E_NON_EXISTENT if
+		 * mainconnection
 		 * 
 		 * @param mainconnectionID
 		 * @param connectionState
 		 */
 		virtual am_Error_e changeMainConnectionStateDB(const am_mainConnectionID_t mainconnectionID, const am_ConnectionState_e connectionState) =0;
 		/**
-		 * changes the sink volume of a sink

-		 * @return E_OK on success, E_DATABASE_ERROR on error, E_NON_EXISTENT if sink was not found
+		 * changes the sink volume of a sink
+		 * @return E_OK on success, E_DATABASE_ERROR on error, E_NON_EXISTENT if sink was
+		 * not found
 		 * 
 		 * @param mainVolume
 		 * @param sinkID
 		 */
 		virtual am_Error_e changeSinkMainVolumeDB(const am_mainVolume_t mainVolume, const am_sinkID_t sinkID) =0;
 		/**
-		 * changes the availablility of a sink

-		 * @return E_OK on success, E_DATABASE_ERROR on error, E_NON_EXISTENT if sink was not found
+		 * changes the availablility of a sink
+		 * @return E_OK on success, E_DATABASE_ERROR on error, E_NON_EXISTENT if sink was
+		 * not found
 		 * 
 		 * @param availability
 		 * @param sinkID
 		 */
 		virtual am_Error_e changeSinkAvailabilityDB(const am_Availability_s& availability, const am_sinkID_t sinkID) =0;
 		/**
-		 * changes the domainstate of a domain 

-		 * @return E_OK on success, E_DATABASE_ERROR on error, E_NON_EXISTENT if domain was not found
+		 * changes the domainstate of a domain
+		 * @return E_OK on success, E_DATABASE_ERROR on error, E_NON_EXISTENT if domain
+		 * was not found
 		 * 
 		 * @param domainState
 		 * @param domainID
 		 */
 		virtual am_Error_e changDomainStateDB(const am_DomainState_e domainState, const am_domainID_t domainID) =0;
 		/**
-		 * changes the mute state of a sink

-		 * @return E_OK on success, E_DATABASE_ERROR on error, E_NON_EXISTENT if sink was not found 
+		 * changes the mute state of a sink
+		 * @return E_OK on success, E_DATABASE_ERROR on error, E_NON_EXISTENT if sink was
+		 * not found
 		 * 
 		 * @param muteState
 		 * @param sinkID
 		 */
 		virtual am_Error_e changeSinkMuteStateDB(const am_MuteState_e muteState, const am_sinkID_t sinkID) =0;
 		/**
-		 * changes the mainsinksoundproperty of a sink

-		 * @return E_OK on success, E_DATABASE_ERROR on error, E_NON_EXISTENT if sink was not found
+		 * changes the mainsinksoundproperty of a sink
+		 * @return E_OK on success, E_DATABASE_ERROR on error, E_NON_EXISTENT if sink was
+		 * not found
 		 * 
 		 * @param soundProperty
 		 * @param sinkID
 		 */
 		virtual am_Error_e changeMainSinkSoundPropertyDB(const am_MainSoundProperty_s& soundProperty, const am_sinkID_t sinkID) =0;
 		/**
-		 * changes the mainsourcesoundproperty of a sink

-		 * @return E_OK on success, E_DATABASE_ERROR on error, E_NON_EXISTENT if source was not found
+		 * changes the mainsourcesoundproperty of a sink
+		 * @return E_OK on success, E_DATABASE_ERROR on error, E_NON_EXISTENT if source
+		 * was not found
 		 * 
 		 * @param soundProperty
 		 * @param sourceID
 		 */
 		virtual am_Error_e changeMainSourceSoundPropertyDB(const am_MainSoundProperty_s& soundProperty, const am_sourceID_t sourceID) =0;
 		/**
-		 * changes the availablility of a source

-		 * @return E_OK on success, E_DATABASE_ERROR  on error, E_NON_EXISTENT if source was not found
+		 * changes the availablility of a source
+		 * @return E_OK on success, E_DATABASE_ERROR  on error, E_NON_EXISTENT if source
+		 * was not found
 		 * 
 		 * @param availability
 		 * @param sourceID
 		 */
 		virtual am_Error_e changeSourceAvailabilityDB(const am_Availability_s& availability, const am_sourceID_t sourceID) =0;
 		/**
-		 * changes a systemProperty

-		 * @return E_OK on success, E_DATABASE_ERROR on error, E_NON_EXISTENT if property was not found
+		 * changes a systemProperty
+		 * @return E_OK on success, E_DATABASE_ERROR on error, E_NON_EXISTENT if property
+		 * was not found
 		 * 
 		 * @param property
 		 */
 		virtual am_Error_e changeSystemPropertyDB(const am_SystemProperty_s& property) =0;
 		/**
-		 * removes a mainconnection from the DB

-		 * @return E_OK on success, E_NON_EXISTENT if main connection was not found, E_DATABASE_ERROR if the database had an error
+		 * removes a mainconnection from the DB
+		 * @return E_OK on success, E_NON_EXISTENT if main connection was not found,
+		 * E_DATABASE_ERROR if the database had an error
 		 * 
 		 * @param mainConnectionID
 		 */
 		virtual am_Error_e removeMainConnectionDB(const am_mainConnectionID_t mainConnectionID) =0;
 		/**
-		 * removes a sink from the DB

-		 * @return E_OK on success, E_NON_EXISTENT if sink was not found, E_DATABASE_ERROR if the database had an error
+		 * removes a sink from the DB
+		 * @return E_OK on success, E_NON_EXISTENT if sink was not found, E_DATABASE_ERROR
+		 * if the database had an error
 		 * 
 		 * @param sinkID
 		 */
 		virtual am_Error_e removeSinkDB(const am_sinkID_t sinkID) =0;
 		/**
-		 * removes a source from the DB

-		 * @return E_OK on success, E_NON_EXISTENT if source was not found, E_DATABASE_ERROR if the database had an error
+		 * removes a source from the DB
+		 * @return E_OK on success, E_NON_EXISTENT if source was not found,
+		 * E_DATABASE_ERROR if the database had an error
 		 * 
 		 * @param sourceID
 		 */
 		virtual am_Error_e removeSourceDB(const am_sourceID_t sourceID) =0;
 		/**
-		 * removes a gateway from the DB

-		 * @return E_OK on success, E_NON_EXISTENT if gateway was not found, E_DATABASE_ERROR if the database had an error
+		 * removes a gateway from the DB
+		 * @return E_OK on success, E_NON_EXISTENT if gateway was not found,
+		 * E_DATABASE_ERROR if the database had an error
 		 * 
 		 * @param gatewayID
 		 */
 		virtual am_Error_e removeGatewayDB(const am_gatewayID_t gatewayID) =0;
 		/**
-		 * removes a crossfader from the DB

-		 * @return E_OK on success, E_NON_EXISTENT if crossfader was not found, E_DATABASE_ERROR if the database had an error
+		 * removes a crossfader from the DB
+		 * @return E_OK on success, E_NON_EXISTENT if crossfader was not found,
+		 * E_DATABASE_ERROR if the database had an error
 		 * 
 		 * @param crossfaderID
 		 */
 		virtual am_Error_e removeCrossfaderDB(const am_crossfaderID_t crossfaderID) =0;
 		/**
-		 * removes a domain from the DB

-		 * @return E_OK on success, E_NON_EXISTENT if domain was not found, E_DATABASE_ERROR if the database had an error
+		 * removes a domain from the DB
+		 * @return E_OK on success, E_NON_EXISTENT if domain was not found,
+		 * E_DATABASE_ERROR if the database had an error
 		 * 
 		 * @param domainID
 		 */
 		virtual am_Error_e removeDomainDB(const am_domainID_t domainID) =0;
 		/**
-		 * removes a domain from the DB

-		 * @return E_OK on success, E_NON_EXISTENT if domain was not found, E_DATABASE_ERROR if the database had an error
+		 * removes a domain from the DB
+		 * @return E_OK on success, E_NON_EXISTENT if domain was not found,
+		 * E_DATABASE_ERROR if the database had an error
 		 * 
 		 * @param sinkClassID
 		 */
 		virtual am_Error_e removeSinkClassDB(const am_sinkClass_t sinkClassID) =0;
 		/**
-		 * removes a domain from the DB

-		 * @return E_OK on success, E_NON_EXISTENT if domain was not found, E_DATABASE_ERROR if the database had an error
+		 * removes a domain from the DB
+		 * @return E_OK on success, E_NON_EXISTENT if domain was not found,
+		 * E_DATABASE_ERROR if the database had an error
 		 * 
 		 * @param sourceClassID
 		 */
 		virtual am_Error_e removeSourceClassDB(const am_sourceClass_t sourceClassID) =0;
 		/**
-		 * returns the ClassInformation of a source

-		 * @return E_OK on success, E_DATABASE_ERROR on error, E_NON_EXISTENT if source was not found
+		 * returns the ClassInformation of a source
+		 * @return E_OK on success, E_DATABASE_ERROR on error, E_NON_EXISTENT if source
+		 * was not found
 		 * 
 		 * @param sourceID
 		 * @param classInfo
 		 */
 		virtual am_Error_e getSourceClassInfoDB(const am_sourceID_t sourceID, am_SourceClass_s& classInfo) const =0;
 		/**
-		 * returns the ClassInformation of a sink

-		 * @return E_OK on success, E_DATABASE_ERROR on error, E_NON_EXISTENT if sink was not found
+		 * returns the ClassInformation of a sink
+		 * @return E_OK on success, E_DATABASE_ERROR on error, E_NON_EXISTENT if sink was
+		 * not found
 		 * 
 		 * @param sinkID
 		 * @param sinkClass
 		 */
 		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
+		 * 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
+		 * 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
+		 * 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
 		 * 
 		 * @param gatewayID
 		 * @param gatewayData
 		 */
 		virtual am_Error_e getGatewayInfoDB(const am_gatewayID_t gatewayID, am_Gateway_s& gatewayData) 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
+		 * 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 crossfaderID
 		 * @param crossfaderData
 		 */
 		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
+		 * 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
+		 * returns all sinks of a domain
+		 * @return E_OK on success, E_DATABASE_ERROR on error, E_NON_EXISTENT if domain
+		 * was not found
 		 * 
 		 * @param domainID
 		 * @param listSinkID
 		 */
 		virtual am_Error_e getListSinksOfDomain(const am_domainID_t domainID, std::vector<am_sinkID_t>& listSinkID) const =0;
 		/**
-		 * returns all source of a domain

-		 * @return E_OK on success, E_DATABASE_ERROR on error, E_NON_EXISTENT if domain was not found
+		 * returns all source of a domain
+		 * @return E_OK on success, E_DATABASE_ERROR on error, E_NON_EXISTENT if domain
+		 * was not found
 		 * 
 		 * @param domainID
 		 * @param listSourceID
 		 */
 		virtual am_Error_e getListSourcesOfDomain(const am_domainID_t domainID, std::vector<am_sourceID_t>& listSourceID) const =0;
 		/**
-		 * returns all crossfaders of a domain

-		 * @return E_OK on success, E_DATABASE_ERROR on error, E_NON_EXISTENT if domain was not found
+		 * returns all crossfaders of a domain
+		 * @return E_OK on success, E_DATABASE_ERROR on error, E_NON_EXISTENT if domain
+		 * was not found
 		 * 
 		 * @param domainID
 		 * @param listCrossfadersID
 		 */
 		virtual am_Error_e getListCrossfadersOfDomain(const am_domainID_t domainID, std::vector<am_crossfaderID_t>& listCrossfadersID) const =0;
 		/**
-		 * returns all gateways of a domain

-		 * @return E_OK on success, E_DATABASE_ERROR on error, E_NON_EXISTENT if domain was not found
+		 * returns all gateways of a domain
+		 * @return E_OK on success, E_DATABASE_ERROR on error, E_NON_EXISTENT if domain
+		 * was not found
 		 * 
 		 * @param domainID
 		 * @param listGatewaysID
 		 */
 		virtual am_Error_e getListGatewaysOfDomain(const am_domainID_t domainID, std::vector<am_gatewayID_t>& listGatewaysID) const =0;
 		/**
-		 * returns a complete list of all MainConnections

+		 * returns a complete list of all MainConnections
 		 * @return E_OK on success, E_DATABASE_ERROR on error
 		 * 
 		 * @param listMainConnections
 		 */
 		virtual am_Error_e getListMainConnections(std::vector<am_MainConnection_s>& listMainConnections) const =0;
 		/**
-		 * returns a complete list of all domains

+		 * returns a complete list of all domains
 		 * @return E_OK on success, E_DATABASE_ERROR on error
 		 * 
 		 * @param listDomains
 		 */
 		virtual am_Error_e getListDomains(std::vector<am_Domain_s>& listDomains) const =0;
 		/**
-		 * returns a complete list of all Connections

+		 * returns a complete list of all Connections
 		 * @return E_OK on success, E_DATABASE_ERROR on error
 		 * 
 		 * @param listConnections
 		 */
 		virtual am_Error_e getListConnections(std::vector<am_Connection_s>& listConnections) const =0;
 		/**
-		 * returns a list of all sinks

+		 * returns a list of all sinks
 		 * @return E_OK on success, E_DATABASE_ERROR on error
 		 * 
 		 * @param listSinks
 		 */
 		virtual am_Error_e getListSinks(std::vector<am_Sink_s>& listSinks) const =0;
 		/**
-		 * returns a list of all sources

+		 * returns a list of all sources
 		 * @return E_OK on success, E_DATABASE_ERROR on error
 		 * 
 		 * @param listSources
 		 */
 		virtual am_Error_e getListSources(std::vector<am_Source_s>& listSources) const =0;
 		/**
-		 * returns a list of all source classes

+		 * returns a list of all source classes
 		 * @return E_OK on success, E_DATABASE_ERROR on error
 		 * 
 		 * @param listSourceClasses
 		 */
 		virtual am_Error_e getListSourceClasses(std::vector<am_SourceClass_s>& listSourceClasses) const =0;
 		/**
-		 * returns a list of all handles

+		 * returns a list of all handles
 		 * @return E_OK on success, E_DATABASE_ERROR on error
 		 * 
 		 * @param listHandles
 		 */
 		virtual am_Error_e getListHandles(std::vector<am_Handle_s>& listHandles) const =0;
 		/**
-		 * returns a list of all crossfaders

+		 * returns a list of all crossfaders
 		 * @return E_OK on success, E_DATABASE_ERROR on error
 		 * 
 		 * @param listCrossfaders
 		 */
 		virtual am_Error_e getListCrossfaders(std::vector<am_Crossfader_s>& listCrossfaders) const =0;
 		/**
-		 * returns a list of  gateways

+		 * returns a list of  gateways
 		 * @return E_OK on success, E_DATABASE_ERROR on error
 		 * 
 		 * @param listGateways
 		 */
 		virtual am_Error_e getListGateways(std::vector<am_Gateway_s>& listGateways) const =0;
 		/**
-		 * returns a list of all sink classes

+		 * returns a list of all sink classes
 		 * @return E_OK on success, E_DATABASE_ERROR on error
 		 * 
 		 * @param listSinkClasses
@@ -576,19 +682,24 @@ namespace am {
 		 */
 		virtual am_Error_e getListSystemProperties(std::vector<am_SystemProperty_s>& listSystemProperties) const =0;
 		/**
-		 * sets the command interface to ready. Will send setCommandReady to each of the plugins. The corresponding answer is confirmCommandReady. 
+		 * sets the command interface to ready. Will send setCommandReady to each of the
+		 * plugins. The corresponding answer is confirmCommandReady. 
 		 */
 		virtual void setCommandReady() =0;
 		/**
-		 * sets the command interface into the rundown state. Will send setCommandRundown to each of the plugins. The corresponding answer is confirmCommandRundown. 
+		 * sets the command interface into the rundown state. Will send setCommandRundown
+		 * to each of the plugins. The corresponding answer is confirmCommandRundown. 
 		 */
 		virtual void setCommandRundown() =0;
 		/**
-		 * sets the routinginterface to  ready. Will send the command  setRoutingReady to each of the plugins. The related answer is confirmRoutingReady.
+		 * sets the routinginterface to  ready. Will send the command  setRoutingReady to
+		 * each of the plugins. The related answer is confirmRoutingReady.
 		 */
 		virtual void setRoutingReady() =0;
 		/**
-		 * sets the routinginterface to the rundown state. Will send the command  setRoutingRundown to each of the plugins. The related answer is confirmRoutingRundown.
+		 * sets the routinginterface to the rundown state. Will send the command
+		 * setRoutingRundown to each of the plugins. The related answer is
+		 * confirmRoutingRundown.
 		 */
 		virtual void setRoutingRundown() =0;
 		/**
@@ -600,19 +711,16 @@ namespace am {
 		 */
 		virtual void confirmControllerRundown() =0;
 		/**
-		 * This function returns the pointer to the socketHandler. This can be used to integrate socket-based activites like communication with the mainloop of the AudioManager.

-		 * returns E_OK if pointer is valid, E_UNKNOWN in case AudioManager was compiled without socketHandler support,
+		 * This function returns the pointer to the socketHandler. This can be used to
+		 * integrate socket-based activites like communication with the mainloop of the
+		 * AudioManager.
+		 * returns E_OK if pointer is valid, E_UNKNOWN in case AudioManager was compiled
+		 * without socketHandler support,
 		 * 
 		 * @param socketHandler
 		 */
 		virtual am_Error_e getSocketHandler(CAmSocketHandler*& socketHandler) =0;
-		/**
-		 * This function returns the version of the interface
-		 * 
-		 * @param version
-		 */
-		virtual void getInterfaceVersion(std::string& version) const =0;
 
 	};
 }
-#endif // !defined(EA_FC4DEA6F_95C3_409f_83CE_63BF9A997339__INCLUDED_)
+#endif // !defined(EA_6E701C15_A8E8_4ad3_A50B_D91A5BD0973F__INCLUDED_)
diff --git a/include/control/IAmControlSend.h b/include/control/IAmControlSend.h
index 7f1cddc..bac33b2 100644
--- a/include/control/IAmControlSend.h
+++ b/include/control/IAmControlSend.h
@@ -19,8 +19,8 @@
  *

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

  */

-#if !defined(EA_FB5AF069_7968_42a2_AB14_7C86BD1888E0__INCLUDED_)

-#define EA_FB5AF069_7968_42a2_AB14_7C86BD1888E0__INCLUDED_

+#if !defined(EA_B9BE9751_825D_44b9_86F1_C2F02E5FA3ED__INCLUDED_)

+#define EA_B9BE9751_825D_44b9_86F1_C2F02E5FA3ED__INCLUDED_

 

 #include <vector>

 #include <string>

@@ -35,17 +35,23 @@ class IAmControlReceive;
 #define ControlSendVersion "1.0" 
 namespace am {
 	/**
-	 * This interface is presented by the AudioManager controller.

-	 * 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.

-	 * There are two rules that have to be kept in mind when implementing against this interface:\n

-	 * \warning

-	 * 1. CALLS TO THIS INTERFACE ARE NOT THREAD SAFE !!!! \n

-	 * 2. YOU MAY NOT THE CALLING INTERFACE DURING AN SYNCHRONOUS OR ASYNCHRONOUS CALL THAT EXPECTS A RETURN VALUE.\n

-	 * \details

-	 * Violation these rules may lead to unexpected behavior! Nevertheless you can implement thread safe by using the deferred-call pattern described on the wiki which also helps to implement calls that are forbidden.\n

+	 * This interface is presented by the AudioManager controller.
+	 * 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.
+	 * There are two rules that have to be kept in mind when implementing against this
+	 * interface:\n
+	 * \warning
+	 * 1. CALLS TO THIS INTERFACE ARE NOT THREAD SAFE !!!! \n
+	 * 2. YOU MAY NOT CALL THE CALLING INTERFACE DURING AN SYNCHRONOUS OR ASYNCHRONOUS
+	 * CALL THAT EXPECTS A RETURN VALUE.\n
+	 * \details
+	 * Violation these rules may lead to unexpected behavior! Nevertheless you can
+	 * implement thread safe by using the deferred-call pattern described on the wiki
+	 * which also helps to implement calls that are forbidden.\n
 	 * For more information, please check CAmSerializer
 	 * @author Christian Mueller
-	 * @created 06-Mar-2012 8:01:08 PM
+	 * @created 07-Mar-2012 6:06:18 PM
 	 */
 	class IAmControlSend
 	{
@@ -60,22 +66,34 @@ namespace am {
 		}
 
 		/**
+		 * This function returns the version of the interface
+		 * returns E_OK, E_UNKOWN if version is unknown.
+		 * 
+		 * @param version
+		 */
+		virtual void getInterfaceVersion(std::string& version) const =0;
+		/**
 		 * Starts up the controller.
 		 * 
-		 * @param controlreceiveinterface    This is a pointer to the ControlReceiveInterface so that the controller knows to whom to communicate.
+		 * @param controlreceiveinterface    This is a pointer to the
+		 * ControlReceiveInterface so that the controller knows to whom to communicate.
 		 */
 		virtual am_Error_e startupController(IAmControlReceive* controlreceiveinterface) =0;
 		/**
-		 * this message is used tell the controller that it should get ready. This message must be acknowledged via confirmControllerReady.
+		 * this message is used tell the controller that it should get ready. This message
+		 * must be acknowledged via confirmControllerReady.
 		 */
 		virtual void setControllerReady() =0;
 		/**
-		 * this message tells the controller that he should prepare everything for the power to be switched off. This message must be acknowledged via confirmControllerRundown.
+		 * this message tells the controller that he should prepare everything for the
+		 * power to be switched off. This message must be acknowledged via
+		 * confirmControllerRundown.
 		 */
 		virtual void setControllerRundown() =0;
 		/**
-		 * is called when a connection request comes in via the command interface

-		 * @return E_OK on success, E_NOT_POSSIBLE on error, E_ALREADY_EXISTENT if already exists
+		 * is called when a connection request comes in via the command interface
+		 * @return E_OK on success, E_NOT_POSSIBLE on error, E_ALREADY_EXISTENT if already
+		 * exists
 		 * 
 		 * @param sourceID
 		 * @param sinkID
@@ -83,14 +101,15 @@ namespace am {
 		 */
 		virtual am_Error_e hookUserConnectionRequest(const am_sourceID_t sourceID, const am_sinkID_t sinkID, am_mainConnectionID_t& mainConnectionID) =0;
 		/**
-		 * is called when a disconnection request comes in via the command interface

-		 * @return E_OK on success, E_NOT_POSSIBLE on error, E_NON_EXISTENT if connection does not exists
+		 * is called when a disconnection request comes in via the command interface
+		 * @return E_OK on success, E_NOT_POSSIBLE on error, E_NON_EXISTENT if connection
+		 * does not exists
 		 * 
 		 * @param connectionID
 		 */
 		virtual am_Error_e hookUserDisconnectionRequest(const am_mainConnectionID_t connectionID) =0;
 		/**
-		 * sets a user MainSinkSoundProperty

+		 * sets a user MainSinkSoundProperty
 		 * @return E_OK on success, E_OUT_OF_RANGE if out of range, E_UNKNOWN on error
 		 * 
 		 * @param sinkID
@@ -98,7 +117,7 @@ namespace am {
 		 */
 		virtual am_Error_e hookUserSetMainSinkSoundProperty(const am_sinkID_t sinkID, const am_MainSoundProperty_s& soundProperty) =0;
 		/**
-		 * sets a user MainSourceSoundProperty

+		 * sets a user MainSourceSoundProperty
 		 * @return E_OK on success, E_OUT_OF_RANGE if out of range, E_UNKNOWN on error
 		 * 
 		 * @param sourceID
@@ -106,14 +125,14 @@ namespace am {
 		 */
 		virtual am_Error_e hookUserSetMainSourceSoundProperty(const am_sourceID_t sourceID, const am_MainSoundProperty_s& soundProperty) =0;
 		/**
-		 * sets a user SystemProperty

+		 * sets a user SystemProperty
 		 * @return E_OK on success, E_OUT_OF_RANGE if out of range, E_UNKNOWN on error
 		 * 
 		 * @param property
 		 */
 		virtual am_Error_e hookUserSetSystemProperty(const am_SystemProperty_s& property) =0;
 		/**
-		 * sets a user volume

+		 * sets a user volume
 		 * @return E_OK on success, E_OUT_OF_RANGE if out of range, E_UNKNOWN on error
 		 * 
 		 * @param SinkID
@@ -121,7 +140,7 @@ namespace am {
 		 */
 		virtual am_Error_e hookUserVolumeChange(const am_sinkID_t SinkID, const am_mainVolume_t newVolume) =0;
 		/**
-		 * sets a user volume as increment 

+		 * sets a user volume as increment
 		 * @return E_OK on success, E_OUT_OF_RANGE if out of range, E_UNKNOWN on error
 		 * 
 		 * @param SinkID
@@ -129,7 +148,7 @@ namespace am {
 		 */
 		virtual am_Error_e hookUserVolumeStep(const am_sinkID_t SinkID, const int16_t increment) =0;
 		/**
-		 * sets the mute state of a sink

+		 * sets the mute state of a sink
 		 * @return E_OK on success, E_UNKNOWN on error
 		 * 
 		 * @param sinkID
@@ -137,15 +156,16 @@ namespace am {
 		 */
 		virtual am_Error_e hookUserSetSinkMuteState(const am_sinkID_t sinkID, const am_MuteState_e muteState) =0;
 		/**
-		 * is called when a routing adaptor registers its domain

-		 * @return E_OK on success, E_UNKNOWN on error, E_ALREADY_EXISTENT if already exists
+		 * is called when a routing adaptor registers its domain
+		 * @return E_OK on success, E_UNKNOWN on error, E_ALREADY_EXISTENT if already
+		 * exists
 		 * 
 		 * @param domainData    ID is omitted here since it has not been created yet
 		 * @param domainID
 		 */
 		virtual am_Error_e hookSystemRegisterDomain(const am_Domain_s& domainData, am_domainID_t& domainID) =0;
 		/**
-		 * is called when a routing adaptor wants to derigister a domain

+		 * is called when a routing adaptor wants to derigister a domain
 		 * @return E_OK on success, E_UNKNOWN on error, E_NON_EXISTENT if not found
 		 * 
 		 * @param domainID
@@ -158,60 +178,66 @@ namespace am {
 		 */
 		virtual void hookSystemDomainRegistrationComplete(const am_domainID_t domainID) =0;
 		/**
-		 * is called when a routing adaptor registers a sink

-		 * @return E_OK on success, E_UNKNOWN on error, E_ALREADY_EXISTENT if already exists
+		 * is called when a routing adaptor registers a sink
+		 * @return E_OK on success, E_UNKNOWN on error, E_ALREADY_EXISTENT if already
+		 * exists
 		 * 
 		 * @param sinkData    Id is omitted here, since it has not been created yet
 		 * @param sinkID
 		 */
 		virtual am_Error_e hookSystemRegisterSink(const am_Sink_s& sinkData, am_sinkID_t& sinkID) =0;
 		/**
-		 * is called when a routing adaptor deregisters a sink

+		 * is called when a routing adaptor deregisters a sink
 		 * @return E_OK on success, E_UNKNOWN on error, E_NON_EXISTENT if not found
 		 * 
 		 * @param sinkID
 		 */
 		virtual am_Error_e hookSystemDeregisterSink(const am_sinkID_t sinkID) =0;
 		/**
-		 * is called when a routing adaptor registers a source

-		 * @return E_OK on success, E_UNKNOWN on error, E_ALREADY_EXISTENT if already exists
+		 * is called when a routing adaptor registers a source
+		 * @return E_OK on success, E_UNKNOWN on error, E_ALREADY_EXISTENT if already
+		 * exists
 		 * 
 		 * @param sourceData    ID is omitted here since it is not yet created
 		 * @param sourceID
 		 */
 		virtual am_Error_e hookSystemRegisterSource(const am_Source_s& sourceData, am_sourceID_t& sourceID) =0;
 		/**
-		 * is called when a routing adaptor deregisters a source

+		 * is called when a routing adaptor deregisters a source
 		 * @return E_OK on success, E_UNKNOWN on error, E_NON_EXISTENT if not found
 		 * 
 		 * @param sourceID
 		 */
 		virtual am_Error_e hookSystemDeregisterSource(const am_sourceID_t sourceID) =0;
 		/**
-		 * is called when a routing adaptor registers a gateway

-		 * @return E_OK on success, E_UNKNOWN on error, E_ALREADY_EXISTENT if already exists
+		 * is called when a routing adaptor registers a gateway
+		 * @return E_OK on success, E_UNKNOWN on error, E_ALREADY_EXISTENT if already
+		 * exists
 		 * 
-		 * @param gatewayData    gatewayID is not set here since it is not created at this point of time
+		 * @param gatewayData    gatewayID is not set here since it is not created at this
+		 * point of time
 		 * @param gatewayID
 		 */
 		virtual am_Error_e hookSystemRegisterGateway(const am_Gateway_s& gatewayData, am_gatewayID_t& gatewayID) =0;
 		/**
-		 * is called when a routing adaptor deregisters a gateway

+		 * is called when a routing adaptor deregisters a gateway
 		 * @return E_OK on success, E_UNKNOWN on error, E_NON_EXISTENT if not found
 		 * 
 		 * @param gatewayID
 		 */
 		virtual am_Error_e hookSystemDeregisterGateway(const am_gatewayID_t gatewayID) =0;
 		/**
-		 * is called when a routing adaptor registers a crossfader

-		 * @return E_OK on success, E_UNKNOWN on error, E_ALREADY_EXISTENT if already exists
+		 * is called when a routing adaptor registers a crossfader
+		 * @return E_OK on success, E_UNKNOWN on error, E_ALREADY_EXISTENT if already
+		 * exists
 		 * 
-		 * @param crossfaderData    gatewayID is not set here since it is not created at this point of time
+		 * @param crossfaderData    gatewayID is not set here since it is not created at
+		 * this point of time
 		 * @param crossfaderID
 		 */
 		virtual am_Error_e hookSystemRegisterCrossfader(const am_Crossfader_s& crossfaderData, am_crossfaderID_t& crossfaderID) =0;
 		/**
-		 * is called when a routing adaptor deregisters a crossfader

+		 * is called when a routing adaptor deregisters a crossfader
 		 * @return E_OK on success, E_UNKNOWN on error, E_NON_EXISTENT if not found
 		 * 
 		 * @param crossfaderID
@@ -268,14 +294,16 @@ namespace am {
 		 */
 		virtual void hookSystemReceiveEarlyData(const std::vector<am_EarlyData_s>& data) =0;
 		/**
-		 * this hook provides information about speed changes.

-		 * The quantization and sampling rate of the speed can be adjusted at compile time of the AudioManagerDaemon.
+		 * this hook provides information about speed changes.
+		 * The quantization and sampling rate of the speed can be adjusted at compile time
+		 * of the AudioManagerDaemon.
 		 * 
 		 * @param speed
 		 */
 		virtual void hookSystemSpeedChange(const am_speed_t speed) =0;
 		/**
-		 * this hook is fired whenever the timing information of a mainconnection has changed.
+		 * this hook is fired whenever the timing information of a mainconnection has
+		 * changed.
 		 * 
 		 * @param mainConnectionID
 		 * @param time
@@ -315,7 +343,8 @@ namespace am {
 		 * ack for source volume changes
 		 * 
 		 * @param handle    the handle that is connected to the volume change
-		 * @param voulme    the volume after the action ended (the desired volume if everything went right, the actual one in case of abortion)
+		 * @param voulme    the volume after the action ended (the desired volume if
+		 * everything went right, the actual one in case of abortion)
 		 * @param error
 		 */
 		virtual void cbAckSetSourceVolumeChange(const am_Handle_s handle, const am_volume_t voulme, const am_Error_e error) =0;
@@ -355,24 +384,20 @@ namespace am {
 		 */
 		virtual void cbAckSetSinkSoundProperty(const am_Handle_s handle, const am_Error_e error) =0;
 		/**
-		 * This function is used by the routing algorithm to retrieve a priorized list of connectionFormats from the Controller.

+		 * This function is used by the routing algorithm to retrieve a priorized list of
+		 * connectionFormats from the Controller.
 		 * @return E_OK in case of successfull priorisation.
 		 * 
 		 * @param sourceID    sourceID of source that shall be connected
 		 * @param sinkID    sinkID of sink that shall be connected
-		 * @param listRoute    This route is the one the priorized connectionFormats is for.
+		 * @param listRoute    This route is the one the priorized connectionFormats is
+		 * for.
 		 * @param listPossibleConnectionFormats    list of possible connectionformats
-		 * @param listPrioConnectionFormats    the list return with prioos from the controller. Best choice on first position.
+		 * @param listPrioConnectionFormats    the list return with prioos from the
+		 * controller. Best choice on first position.
 		 */
 		virtual am_Error_e getConnectionFormatChoice(const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_Route_s listRoute, const std::vector<am_ConnectionFormat_e> listPossibleConnectionFormats, std::vector<am_ConnectionFormat_e>& listPrioConnectionFormats) =0;
 		/**
-		 * This function returns the version of the interface

-		 * returns E_OK, E_UNKOWN if version is unknown.
-		 * 
-		 * @param version
-		 */
-		virtual void getInterfaceVersion(std::string& version) const =0;
-		/**
 		 * confirms the setCommandReady call
 		 */
 		virtual void confirmCommandReady() =0;
@@ -391,4 +416,4 @@ namespace am {
 
 	};
 }
-#endif // !defined(EA_FB5AF069_7968_42a2_AB14_7C86BD1888E0__INCLUDED_)
+#endif // !defined(EA_B9BE9751_825D_44b9_86F1_C2F02E5FA3ED__INCLUDED_)
diff --git a/include/control/uncomment.pl b/include/control/uncomment.pl
new file mode 100755
index 0000000..f06f52c
--- /dev/null
+++ b/include/control/uncomment.pl
@@ -0,0 +1,24 @@
+use strict;
+use warnings;
+
+foreach (@ARGV)
+{
+
+	open FILE, $_ or die "Couldn't open file: $!"; 
+	my $string = join("", <FILE>); 
+	close FILE;
+
+	$string=~ s|/[*].*?[*]/||sg;
+	$string=~ s/virtual//sg; 
+	$string=~ s/=0;/;/sg;
+	$string=~ s/(^|\n)[\n\s]*/$1/g;
+
+	open F, ">$_" or die "Couldn't open file: $!"; 
+	print F $string;
+	close F;
+}
+
+
+
+
+