* recreated the header files out of the model. Added versioning support in the headerfiles generated

* ensured compatibility with 64 bit systems while compiling dbus [ changed FindDBUS.cmake]
* updated the README to better support building
* updated typo in introspectable string of DBusWrapper
* reworked including strategie
* added getInterfafeVersion method on all interfaces
* added Interface Versioning support
* added version as part of .so ending
* it is no possible to set a vector of source and sink sound properties at a time
* added interface to ask for all loaded plugins on RoutingSender
* added first version of telnet server (not yet productive) - set to not active in CMakeLists.txt
* added changelog (created out of git commit log)
* added default values for all enum types to be save even on other if communication is on other domain

10 files changed, 268 insertions, 158 deletions

diff --git a/includes/audiomanagertypes.cpp b/includes/audiomanagertypes.cpp
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/includes/audiomanagertypes.cpp
diff --git a/includes/audiomanagertypes.h b/includes/audiomanagertypes.h
index 27764d1..265a8c7 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_9BBD9DCA_BBCF_45e4_8291_45F44B455D62__INCLUDED_)

-#define EA_9BBD9DCA_BBCF_45e4_8291_45F44B455D62__INCLUDED_

+#if !defined(EA_F71B3C5D_FC1B_400e_A704_C0FF897D4E53__INCLUDED_)

+#define EA_F71B3C5D_FC1B_400e_A704_C0FF897D4E53__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 22-Dec-2011 12:55:04 AM
+	 * @created 11-Jan-2012 9:19:44 PM
 	 */
 	typedef uint16_t am_domainID_t;
 
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 22-Dec-2011 12:55:05 AM
+	 * @created 11-Jan-2012 9:19:45 PM
 	 */
 	typedef uint16_t am_sourceID_t;
 
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 22-Dec-2011 12:55:06 AM
+	 * @created 11-Jan-2012 9:19:45 PM
 	 */
 	typedef uint16_t am_sinkID_t;
 
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 22-Dec-2011 12:55:06 AM
+	 * @created 11-Jan-2012 9:19:45 PM
 	 */
 	typedef uint16_t am_gatewayID_t;
 
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 22-Dec-2011 12:55:06 AM
+	 * @created 11-Jan-2012 9:19:46 PM
 	 */
 	typedef uint16_t am_crossfaderID_t;
 
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 22-Dec-2011 12:55:06 AM
+	 * @created 11-Jan-2012 9:19:46 PM
 	 */
 	typedef uint16_t am_connectionID_t;
 
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 22-Dec-2011 12:55:06 AM
+	 * @created 11-Jan-2012 9:19:46 PM
 	 */
 	typedef uint16_t am_mainConnectionID_t;
 
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 22-Dec-2011 12:55:06 AM
+	 * @created 11-Jan-2012 9:19:46 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 22-Dec-2011 12:55:07 AM
+	 * @created 11-Jan-2012 9:19:46 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 22-Dec-2011 12:55:07 AM
+	 * @created 11-Jan-2012 9:19:47 PM
 	 */
 	typedef int16_t am_mainVolume_t;
 
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 22-Dec-2011 12:55:07 AM
+	 * @created 11-Jan-2012 9:19:47 PM
 	 */
 	typedef uint16_t am_sourceClass_t;
 
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 22-Dec-2011 12:55:07 AM
+	 * @created 11-Jan-2012 9:19:47 PM
 	 */
 	typedef uint16_t am_sinkClass_t;
 
@@ -212,7 +212,7 @@ namespace am {
 	 * time in ms!
 	 * @author christian
 	 * @version 1.0
-	 * @created 22-Dec-2011 12:55:07 AM
+	 * @created 11-Jan-2012 9:19:47 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 22-Dec-2011 12:55:08 AM
+	 * @created 11-Jan-2012 9:19:48 PM
 	 */
 	typedef int16_t am_timeSync_t;
 
@@ -228,14 +228,14 @@ namespace am {
 	 * with the help of this enum, sinks and sources can report their availability state
 	 * @author christian
 	 * @version 1.0
-	 * @created 22-Dec-2011 12:55:08 AM
+	 * @created 11-Jan-2012 9:19:48 PM
 	 */
 	enum am_Availablility_e
 	{
 		A_AVAILABLE = 0,
-		A_UNAVAILABLE,
-		A_UNKNOWN,
-		A_MAX,
+		A_UNAVAILABLE = 1,
+		A_UNKNOWN = 2,
+		A_MAX = 3,
 		A_MIN = A_AVAILABLE
 	};
 
@@ -243,7 +243,7 @@ namespace am {
 	 * represents the connection state
 	 * @author christian
 	 * @version 1.0
-	 * @created 22-Dec-2011 12:55:08 AM
+	 * @created 11-Jan-2012 9:19:48 PM
 	 */
 	enum am_ConnectionState_e
 	{
@@ -254,34 +254,34 @@ namespace am {
 		/**
 		 * the connection is ready to be used
 		 */
-		CS_CONNECTED,
+		CS_CONNECTED = 1,
 		/**
 		 * the connection is in the course to be knocked down
 		 */
-		CS_DISCONNECTING,
+		CS_DISCONNECTING = 2,
 		/**
 		 * only relevant for connectionStatechanged. Is send after the connection was removed
 		 */
-		CS_DISCONNECTED,
+		CS_DISCONNECTED = 3,
 		/**
 		 * this means the connection is still build up but unused at the moment
 		 */
-		CS_SUSPENDED,
-		CS_MAX,
+		CS_SUSPENDED = 4,
+		CS_MAX = 5,
 		CS_MIN = CS_CONNECTING
 	};
 
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 22-Dec-2011 12:55:08 AM
+	 * @created 11-Jan-2012 9:19:48 PM
 	 */
 	enum am_DomainState_e
 	{
 		DS_CONTROLLED = 0,
-		DS_INDEPENDENT_STARTUP,
-		DS_INDEPENDENT_RUNDOWN,
-		DS_MAX,
+		DS_INDEPENDENT_STARTUP = 1,
+		DS_INDEPENDENT_RUNDOWN = 2,
+		DS_MAX = 3,
 		DS_MIN = DS_CONTROLLED
 	};
 
@@ -289,15 +289,15 @@ namespace am {
 	 * This enum characterizes the data of the EarlyData_t
 	 * @author christian
 	 * @version 1.0
-	 * @created 22-Dec-2011 12:55:08 AM
+	 * @created 11-Jan-2012 9:19:48 PM
 	 */
 	enum am_EarlyDataType_e
 	{
 		ED_SOURCE_VOLUME = 0,
-		ED_SINK_VOLUME,
-		ED_SOURCE_PROPERTY,
-		ED_SINK_PROPERTY,
-		ED_MAX,
+		ED_SINK_VOLUME = 1,
+		ED_SOURCE_PROPERTY = 2,
+		ED_SINK_PROPERTY = 3,
+		ED_MAX = 4,
 		ES_MIN = ED_SOURCE_VOLUME
 	};
 
@@ -305,38 +305,38 @@ 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 22-Dec-2011 12:55:09 AM
+	 * @created 11-Jan-2012 9:19:49 PM
 	 */
 	enum am_Error_e
 	{
 		E_OK = 0,
-		E_UNKNOWN,
-		E_OUT_OF_RANGE,
-		E_NOT_USED,
-		E_DATABASE_ERROR,
-		E_ALREADY_EXISTS,
-		E_NO_CHANGE,
-		E_NOT_POSSIBLE,
-		E_NON_EXISTENT,
-		E_ABORTED,
+		E_UNKNOWN = 1,
+		E_OUT_OF_RANGE = 2,
+		E_NOT_USED = 3,
+		E_DATABASE_ERROR = 4,
+		E_ALREADY_EXISTS = 5,
+		E_NO_CHANGE = 6,
+		E_NOT_POSSIBLE = 7,
+		E_NON_EXISTENT = 8,
+		E_ABORTED = 9,
 		/**
 		 * This error is returned in case a connect is issued with a connectionFormat that cannot be selected for the connection. This could be either due to the capabilities of a source or a sink or gateway compatibilities for example
 		 */
-		E_WRONG_FORMAT,
-		E_MAX,
+		E_WRONG_FORMAT = 10,
+		E_MAX = 11,
 		E_MIN = E_OK
 	};
 
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 22-Dec-2011 12:55:09 AM
+	 * @created 11-Jan-2012 9:19:49 PM
 	 */
 	enum am_MuteState_e
 	{
 		MS_MUTED = 0,
-		MS_UNMUTED,
-		MS_MAX,
+		MS_UNMUTED = 1,
+		MS_MAX = 2,
 		MS_MIN = MS_MUTED
 	};
 
@@ -344,7 +344,7 @@ namespace am {
 	 * The source state reflects the state of the source
 	 * @author christian
 	 * @version 1.0
-	 * @created 22-Dec-2011 12:55:09 AM
+	 * @created 11-Jan-2012 9:19:49 PM
 	 */
 	enum am_SourceState_e
 	{
@@ -355,12 +355,12 @@ namespace am {
 		/**
 		 * The source cannot be heared
 		 */
-		SS_OFF,
+		SS_OFF = 1,
 		/**
 		 * The source is paused. Meaning it cannot be heared but should be prepared to play again soon.
 		 */
-		SS_PAUSED,
-		SS_MAX,
+		SS_PAUSED = 2,
+		SS_MAX = 3,
 		SS_MIN = SS_ON
 	};
 
@@ -368,32 +368,34 @@ 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 22-Dec-2011 12:55:09 AM
+	 * @created 11-Jan-2012 9:19:49 PM
 	 */
 	enum am_Handle_e
 	{
 		H_CONNECT = 0,
-		H_DISCONNECT,
-		H_SETSOURCESTATE,
-		H_SETSINKVOLUME,
-		H_SETSOURCEVOLUME,
-		H_SETSINKSOUNDPROPERTY,
-		H_SETSOURCESOUNDPROPERTY,
-		H_CROSSFADE,
-		H_MAX,
+		H_DISCONNECT = 1,
+		H_SETSOURCESTATE = 2,
+		H_SETSINKVOLUME = 3,
+		H_SETSOURCEVOLUME = 4,
+		H_SETSINKSOUNDPROPERTY = 5,
+		H_SETSOURCESOUNDPROPERTY = 6,
+		H_SETSINKSOUNDPROPERTIES = 7,
+		H_SETSOURCESOUNDPROPERTIES = 8,
+		H_CROSSFADE = 9,
+		H_MAX = 10,
 		H_MIN = H_CONNECT
 	};
 
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 22-Dec-2011 12:55:09 AM
+	 * @created 11-Jan-2012 9:19:49 PM
 	 */
 	enum am_InterruptState_e
 	{
 		IS_OFF = 0,
-		IS_INTERRUPTED,
-		IS_MAX,
+		IS_INTERRUPTED = 1,
+		IS_MAX = 2,
 		IS_MIN = IS_OFF
 	};
 
@@ -401,14 +403,14 @@ namespace am {
 	 * describes the active sink of a crossfader.
 	 * @author christian
 	 * @version 1.0
-	 * @created 22-Dec-2011 12:55:10 AM
+	 * @created 11-Jan-2012 9:19:49 PM
 	 */
 	enum am_HotSink_e
 	{
 		HS_SINKA = 0,
-		HS_SINKB,
-		HS_INTERMEDIATE,
-		HS_MAX,
+		HS_SINKB = 1,
+		HS_INTERMEDIATE = 2,
+		HS_MAX = 3,
 		HS_MIN = HS_SINKA
 	};
 
@@ -416,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 22-Dec-2011 12:55:10 AM
+	 * @created 11-Jan-2012 9:19:50 PM
 	 */
 	struct am_Availability_s
 	{
@@ -436,7 +438,7 @@ namespace am {
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 22-Dec-2011 12:55:10 AM
+	 * @created 11-Jan-2012 9:19:50 PM
 	 */
 	struct am_ClassProperty_s
 	{
@@ -450,7 +452,7 @@ namespace am {
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 22-Dec-2011 12:55:10 AM
+	 * @created 11-Jan-2012 9:19:50 PM
 	 */
 	struct am_Crossfader_s
 	{
@@ -468,7 +470,7 @@ namespace am {
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 22-Dec-2011 12:55:11 AM
+	 * @created 11-Jan-2012 9:19:51 PM
 	 */
 	struct am_Gateway_s
 	{
@@ -509,7 +511,7 @@ namespace am {
 	 * This represents one "hopp" in a route
 	 * @author christian
 	 * @version 1.0
-	 * @created 22-Dec-2011 12:55:11 AM
+	 * @created 11-Jan-2012 9:19:51 PM
 	 */
 	struct am_RoutingElement_s
 	{
@@ -525,7 +527,7 @@ namespace am {
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 22-Dec-2011 12:55:11 AM
+	 * @created 11-Jan-2012 9:19:51 PM
 	 */
 	struct am_Route_s
 	{
@@ -540,7 +542,7 @@ namespace am {
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 22-Dec-2011 12:55:12 AM
+	 * @created 11-Jan-2012 9:19:52 PM
 	 */
 	struct am_SoundProperty_s
 	{
@@ -554,7 +556,7 @@ namespace am {
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 22-Dec-2011 12:55:12 AM
+	 * @created 11-Jan-2012 9:19:52 PM
 	 */
 	struct am_SystemProperty_s
 	{
@@ -574,7 +576,7 @@ namespace am {
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 22-Dec-2011 12:55:12 AM
+	 * @created 11-Jan-2012 9:19:52 PM
 	 */
 	struct am_SinkClass_s
 	{
@@ -589,7 +591,7 @@ namespace am {
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 22-Dec-2011 12:55:12 AM
+	 * @created 11-Jan-2012 9:19:53 PM
 	 */
 	struct am_SourceClass_s
 	{
@@ -608,7 +610,7 @@ namespace am {
 	 * this type holds all information of sources relevant to the HMI
 	 * @author christian
 	 * @version 1.0
-	 * @created 22-Dec-2011 12:55:13 AM
+	 * @created 11-Jan-2012 9:19:53 PM
 	 */
 	struct am_SourceType_s
 	{
@@ -625,7 +627,7 @@ namespace am {
 	 * this type holds all information of sinks relevant to the HMI
 	 * @author christian
 	 * @version 1.0
-	 * @created 22-Dec-2011 12:55:13 AM
+	 * @created 11-Jan-2012 9:19:53 PM
 	 */
 	struct am_SinkType_s
 	{
@@ -643,7 +645,7 @@ namespace am {
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 22-Dec-2011 12:55:13 AM
+	 * @created 11-Jan-2012 9:19:53 PM
 	 */
 	struct am_Handle_s
 	{
@@ -657,7 +659,7 @@ namespace am {
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 22-Dec-2011 12:55:14 AM
+	 * @created 11-Jan-2012 9:19:54 PM
 	 */
 	struct am_MainSoundProperty_s
 	{
@@ -672,7 +674,7 @@ namespace am {
 	 * this type holds all information of connections relevant to the HMI
 	 * @author christian
 	 * @version 1.0
-	 * @created 22-Dec-2011 12:55:14 AM
+	 * @created 11-Jan-2012 9:19:54 PM
 	 */
 	struct am_MainConnectionType_s
 	{
@@ -689,7 +691,7 @@ namespace am {
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 22-Dec-2011 12:55:14 AM
+	 * @created 11-Jan-2012 9:19:54 PM
 	 */
 	struct am_MainConnection_s
 	{
@@ -705,7 +707,7 @@ namespace am {
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 22-Dec-2011 12:55:15 AM
+	 * @created 11-Jan-2012 9:19:55 PM
 	 */
 	struct am_Sink_s
 	{
@@ -729,7 +731,7 @@ namespace am {
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 22-Dec-2011 12:55:15 AM
+	 * @created 11-Jan-2012 9:19:56 PM
 	 */
 	struct am_Source_s
 	{
@@ -762,7 +764,7 @@ namespace am {
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 22-Dec-2011 12:55:15 AM
+	 * @created 11-Jan-2012 9:19:56 PM
 	 */
 	struct am_Domain_s
 	{
@@ -781,7 +783,7 @@ namespace am {
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 22-Dec-2011 12:55:16 AM
+	 * @created 11-Jan-2012 9:19:56 PM
 	 */
 	struct am_Connection_s
 	{
@@ -801,7 +803,7 @@ namespace am {
 	 * soundProperty_t in case of ED_SOURCE_PROPERTY, ED_SINK_PROPERTY 
 	 * @author christian
 	 * @version 1.0
-	 * @created 22-Dec-2011 12:55:16 AM
+	 * @created 11-Jan-2012 9:19:56 PM
 	 */
 	union am_EarlyData_u
 	{
@@ -818,7 +820,7 @@ namespace am {
 	 * sinkID in case of ED_SINK_VOLUME, ED_SINK_PROPERTY 
 	 * @author christian
 	 * @version 1.0
-	 * @created 22-Dec-2011 12:55:16 AM
+	 * @created 11-Jan-2012 9:19:57 PM
 	 */
 	union am_DataType_u
 	{
@@ -832,7 +834,7 @@ namespace am {
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 22-Dec-2011 12:55:16 AM
+	 * @created 11-Jan-2012 9:19:57 PM
 	 */
 	struct am_EarlyData_s
 	{
@@ -844,4 +846,4 @@ namespace am {
 
 	};
 }
-#endif // !defined(EA_9BBD9DCA_BBCF_45e4_8291_45F44B455D62__INCLUDED_)
+#endif // !defined(EA_F71B3C5D_FC1B_400e_A704_C0FF897D4E53__INCLUDED_)
diff --git a/includes/command/CommandReceiveInterface.h b/includes/command/CommandReceiveInterface.h
index b363bd3..9e2aa8a 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_2C18A494_5252_4d1b_A0B0_FAE151B68AEA__INCLUDED_)

-#define EA_2C18A494_5252_4d1b_A0B0_FAE151B68AEA__INCLUDED_

+#if !defined(EA_A90A11B4_5916_4910_AE0C_4F9713F898A1__INCLUDED_)

+#define EA_A90A11B4_5916_4910_AE0C_4F9713F898A1__INCLUDED_

 

 #include <vector>

 #include <string>

@@ -34,12 +34,13 @@ class SocketHandler;
 }

 
 
+#define CommandReceiveVersion 1
 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 22-Dec-2011 12:55:17 AM
+	 * @created 11-Jan-2012 9:19:57 PM
 	 */
 	class CommandReceiveInterface
 	{
@@ -188,7 +189,11 @@ namespace am {
 		 * @param socketHandler
 		 */
 		virtual am_Error_e getSocketHandler(SocketHandler*& socketHandler) const =0;
+		/**
+		 * This function returns the version of the interface.
+		 */
+		virtual uint16_t getInterfaceVersion() const =0;
 
 	};
 }
-#endif // !defined(EA_2C18A494_5252_4d1b_A0B0_FAE151B68AEA__INCLUDED_)
+#endif // !defined(EA_A90A11B4_5916_4910_AE0C_4F9713F898A1__INCLUDED_)
diff --git a/includes/command/CommandSendInterface.h b/includes/command/CommandSendInterface.h
index 0da4d76..8ae8b50 100644
--- a/includes/command/CommandSendInterface.h
+++ b/includes/command/CommandSendInterface.h
@@ -22,22 +22,24 @@
 *

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

 */

-#if !defined(EA_D28BAC35_CEA8_4ec8_AF26_00050F6CD9FA__INCLUDED_)

-#define EA_D28BAC35_CEA8_4ec8_AF26_00050F6CD9FA__INCLUDED_

+#if !defined(EA_B654AC7A_A617_46d0_836D_36974F99E750__INCLUDED_)

+#define EA_B654AC7A_A617_46d0_836D_36974F99E750__INCLUDED_

 

 #include <vector>

 #include <string>

 #include "../audiomanagertypes.h"

-#include "CommandReceiveInterface.h"
-
-#include "CommandReceiveInterface.h"
+

+namespace am {

+class CommandReceiveInterface;

+}
 
+#define CommandSendVersion 1
 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 22-Dec-2011 12:55:17 AM
+	 * @created 11-Jan-2012 9:19:58 PM
 	 */
 	class CommandSendInterface
 	{
@@ -139,13 +141,18 @@ namespace am {
 		 */
 		virtual void cbSystemPropertyChanged(const am_SystemProperty_s& systemProperty) =0;
 		/**
-		 * this callback is called when the timinginformation for a mainconnection has changed.
+		 * CommandReceiveVer_0.0.9.
 		 * 
-		 * @param mainConnection
 		 * @param time
+		 * @param mainConnectionID
+		 */
+		virtual void cbTimingInformationChanged(const am_timeSync_t time, const am_mainConnectionID_t mainConnectionID) =0;
+		/**
+		 * This function returns the version of the interface

+		 * returns E_OK, E_UNKOWN if version is unknown.
 		 */
-		virtual void cbTimingInformationChanged(const am_mainConnectionID_t mainConnection, const am_timeSync_t time) =0;
+		virtual uint16_t getInterfaceVersion() const =0;
 
 	};
 }
-#endif // !defined(EA_D28BAC35_CEA8_4ec8_AF26_00050F6CD9FA__INCLUDED_)
+#endif // !defined(EA_B654AC7A_A617_46d0_836D_36974F99E750__INCLUDED_)
diff --git a/includes/config.h b/includes/config.h
index fb74975..f12b474 100644
--- a/includes/config.h
+++ b/includes/config.h
@@ -1,17 +1,21 @@
 #ifndef _CONFIG_H
 #define _CONFIG_H
 
-#define DAEMONVERSION "ver-0.0.1-1-g93d7610"
+#define DAEMONVERSION "ver-0.0.1-4-ge7af3cd"
 
 #define WITH_DBUS_WRAPPER
 #define WITH_SOCKETHANDLER_LOOP 
 /* #undef WITH_SIMPLEDBUS_LOOP */
 #define WITH_PPOLL
+/* #undef WITH_TELNET */
 
 #define DEFAULT_PLUGIN_COMMAND_DIR "/home/christian/workspace/gitserver/bin/plugins/command"
 #define DEFAULT_PLUGIN_ROUTING_DIR "/home/christian/workspace/gitserver/bin/plugins/routing"
 #define CONTROLLER_PLUGIN "/home/christian/workspace/gitserver/bin/plugins/control/libPluginControlInterface.so"
 
+#define DEFAULT_TELNETPORT 6060
+#define MAX_TELNETCONNECTIONS 3
+
 #define DBUS_SERVICE_PREFIX "org.genivi.audiomanager"
 #define DBUS_SERVICE_OBJECT_PATH "/org/genivi/audiomanager"
 
diff --git a/includes/control/ControlReceiveInterface.h b/includes/control/ControlReceiveInterface.h
index bcdd451..9478794 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_0244757B_93AD_4fd4_83D0_7AB70C332042__INCLUDED_)

-#define EA_0244757B_93AD_4fd4_83D0_7AB70C332042__INCLUDED_

+#if !defined(EA_1D9028B1_EE8B_4860_B728_B37C63BA3D03__INCLUDED_)

+#define EA_1D9028B1_EE8B_4860_B728_B37C63BA3D03__INCLUDED_

 

 #include <vector>

 #include <string>

@@ -33,12 +33,13 @@ class SocketHandler;
 }

 
 
+#define ControlReceiveVersion 1
 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 22-Dec-2011 12:55:17 AM
+	 * @created 11-Jan-2012 9:19:58 PM
 	 */
 	class ControlReceiveInterface
 	{
@@ -126,6 +127,15 @@ 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
+		 * 
+		 * @param handle
+		 * @param sinkID
+		 * @param soundProperty
+		 */
+		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
 		 * 
@@ -135,6 +145,15 @@ 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
+		 * 
+		 * @param handle
+		 * @param sourceID
+		 * @param soundProperty
+		 */
+		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
 		 * 
@@ -536,7 +555,11 @@ namespace am {
 		 * @param socketHandler
 		 */
 		virtual am_Error_e getSocketHandler(SocketHandler*& socketHandler) =0;
+		/**
+		 * This function returns the version of the interface
+		 */
+		virtual uint16_t getInterfaceVersion() const =0;
 
 	};
 }
-#endif // !defined(EA_0244757B_93AD_4fd4_83D0_7AB70C332042__INCLUDED_)
+#endif // !defined(EA_1D9028B1_EE8B_4860_B728_B37C63BA3D03__INCLUDED_)
diff --git a/includes/control/ControlSendInterface.h b/includes/control/ControlSendInterface.h
index da7cbce..8d2f299 100644
--- a/includes/control/ControlSendInterface.h
+++ b/includes/control/ControlSendInterface.h
@@ -22,21 +22,25 @@
 *

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

 */

-#if !defined(EA_FCDD8CB7_6516_4ee0_AF20_BF3953319E5D__INCLUDED_)

-#define EA_FCDD8CB7_6516_4ee0_AF20_BF3953319E5D__INCLUDED_

+#if !defined(EA_F5981A51_5790_4c74_A384_3600DFC50AF5__INCLUDED_)

+#define EA_F5981A51_5790_4c74_A384_3600DFC50AF5__INCLUDED_

 

 #include <vector>

 #include <string>

 #include "../audiomanagertypes.h"

-#include "ControlReceiveInterface.h"
+

+namespace am {

+class ControlReceiveInterface;

+}
 
+#define ControlSendVersion 1
 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.
 	 * @author christian
 	 * @version 1.0
-	 * @created 22-Dec-2011 12:55:18 AM
+	 * @created 11-Jan-2012 9:55:56 PM
 	 */
 	class ControlSendInterface
 	{
@@ -315,6 +319,13 @@ namespace am {
 		 * @param handle
 		 * @param error
 		 */
+		virtual void cbAckSetSourceSoundProperties(const am_Handle_s handle, const am_Error_e error) =0;
+		/**
+		 * ack for setting of sourcesoundproperties
+		 * 
+		 * @param handle
+		 * @param error
+		 */
 		virtual void cbAckSetSourceSoundProperty(const am_Handle_s handle, const am_Error_e error) =0;
 		/**
 		 * ack for setting of sinksoundproperties
@@ -322,8 +333,20 @@ namespace am {
 		 * @param handle
 		 * @param error
 		 */
+		virtual void cbAckSetSinkSoundProperties(const am_Handle_s handle, const am_Error_e error) =0;
+		/**
+		 * ack for setting of sinksoundproperties
+		 * 
+		 * @param handle
+		 * @param error
+		 */
 		virtual void cbAckSetSinkSoundProperty(const am_Handle_s handle, const am_Error_e error) =0;
+		/**
+		 * This function returns the version of the interface

+		 * returns E_OK, E_UNKOWN if version is unknown.
+		 */
+		virtual uint16_t getInterfaceVersion() const =0;
 
 	};
 }
-#endif // !defined(EA_FCDD8CB7_6516_4ee0_AF20_BF3953319E5D__INCLUDED_)
+#endif // !defined(EA_F5981A51_5790_4c74_A384_3600DFC50AF5__INCLUDED_)
diff --git a/includes/projecttypes.h b/includes/projecttypes.h
index 6e00614..a50e92c 100644
--- a/includes/projecttypes.h
+++ b/includes/projecttypes.h
@@ -22,22 +22,22 @@
 *

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

 */

-#if !defined(EA_2CBBFF9A_7EFD_4a63_8AD7_1DC609634438__INCLUDED_)

-#define EA_2CBBFF9A_7EFD_4a63_8AD7_1DC609634438__INCLUDED_

+#if !defined(EA_D30EA3FF_652C_41f2_84C1_C4EDCBFA0E37__INCLUDED_)

+#define EA_D30EA3FF_652C_41f2_84C1_C4EDCBFA0E37__INCLUDED_

 

 namespace am {

 	/**

 	 * This enum classifies the format in which data is exchanged within a connection. The enum itself is project specific although there are some Genivi standard formats defined.

 	 * @author christian

 	 * @version 1.0

-	 * @created 22-Dec-2011 12:55:17 AM

+	 * @created 11-Jan-2012 9:19:57 PM

 	 */

 	enum am_ConnectionFormat_e

 	{

 		CF_STEREO = 0,

-		CF_MONO,

-		CF_ANALOG,

-		CF_MAX,

+		CF_MONO = 1,

+		CF_ANALOG = 2,

+		CF_MAX = 3,

 		CF_MIN = CF_STEREO

 	};

 

@@ -45,17 +45,17 @@ namespace am {
 	 * This enum gives the information about reason for reason for Source/Sink change

 	 * @author christian

 	 * @version 1.0

-	 * @created 22-Dec-2011 12:55:17 AM

+	 * @created 11-Jan-2012 9:19:57 PM

 	 */

 	enum am_AvailabilityReason_e

 	{

 		AR_NEWMEDIA = 0,

-		AR_SAMEMEDIA,

-		AR_NOMEDIA,

-		AR_UNKNOWN,

-		AR_TEMPERATURE,

-		AR_VOLTAGE,

-		AR_MAX,

+		AR_SAMEMEDIA = 1,

+		AR_NOMEDIA = 2,

+		AR_UNKNOWN = 3,

+		AR_TEMPERATURE = 4,

+		AR_VOLTAGE = 5,

+		AR_MAX = 6,

 		AR_MIN = AR_NEWMEDIA

 	};

 

@@ -63,7 +63,7 @@ namespace am {
 	 * product specific identifier of property

 	 * @author christian

 	 * @version 1.0

-	 * @created 22-Dec-2011 12:55:17 AM

+	 * @created 11-Jan-2012 9:19:57 PM

 	 */

 	enum am_ClassProperty_e

 	{

@@ -74,8 +74,8 @@ namespace am {
 		/**

 		 * defines the SINK_TYPE. Project specific

 		 */

-		CP_SINK_TYPE,

-		CP_MAX,

+		CP_SINK_TYPE = 1,

+		CP_MAX = 2,

 		CP_MIN = CP_SOURCE_TYPE

 	};

 

@@ -84,7 +84,7 @@ namespace am {
 	 * It is in the responsibility of the product to make sure that the routing plugins are aware of the ramp types used.
 	 * @author christian
 	 * @version 1.0
-	 * @created 22-Dec-2011 12:55:17 AM
+	 * @created 11-Jan-2012 9:19:57 PM
 	 */
 	enum am_RampType_e
 	{
@@ -95,10 +95,10 @@ namespace am {
 		/**
 		 * This ramp type will set the volume as fast as possible.  
 		 */
-		RAMP_NO_BLOB,
-		RAMP_LOG,
-		RAMP_STRAIGHT,
-		RAMP_MAX,
+		RAMP_NO_BLOB = 1,
+		RAMP_LOG = 2,
+		RAMP_STRAIGHT = 3,
+		RAMP_MAX = 4,
 		RAMP_MIN = RAMP_DIRECT
 	};
 
@@ -106,14 +106,14 @@ namespace am {
 	 * sound properties. Within genivi only the standard properties are defined, for products these need to be extended.
 	 * @author christian
 	 * @version 1.0
-	 * @created 22-Dec-2011 12:55:17 AM
+	 * @created 11-Jan-2012 9:19:57 PM
 	 */
 	enum am_SoundPropertyType_e
 	{
 		SP_TREBLE = 0,
-		SP_MID,
-		SP_BASS,
-		SP_MAX,
+		SP_MID = 1,
+		SP_BASS = 2,
+		SP_MAX = 3,
 		SP_MIN = SP_TREBLE
 	};
 
@@ -121,7 +121,7 @@ namespace am {
 	 * Here are all SoundProperties that can be set via the CommandInterface. Product specific
 	 * @author christian
 	 * @version 1.0
-	 * @created 22-Dec-2011 12:55:17 AM
+	 * @created 11-Jan-2012 9:19:57 PM
 	 */
 	enum am_MainSoundPropertyType_e
 	{
@@ -129,8 +129,8 @@ namespace am {
 		 * gives the navigation offset in percent
 		 */
 		MSP_NAVIGATION_OFFSET = 0,
-		MSP_TEST,
-		MSP_MAX,
+		MSP_TEST = 1,
+		MSP_MAX = 2,
 		MSP_MIN = MSP_NAVIGATION_OFFSET
 	};
 
@@ -138,13 +138,13 @@ namespace am {
 	 * describes the different system properties. Project specific
 	 * @author christian
 	 * @version 1.0
-	 * @created 22-Dec-2011 12:55:17 AM
+	 * @created 11-Jan-2012 9:19:57 PM
 	 */
 	enum am_SystemPropertyType_e
 	{
 		SYP_TEST = 0,
-		SYP_MAX,
+		SYP_MAX = 1,
 		SYP_MIN = SYP_TEST
 	};
 }
-#endif // !defined(EA_2CBBFF9A_7EFD_4a63_8AD7_1DC609634438__INCLUDED_)
+#endif // !defined(EA_D30EA3FF_652C_41f2_84C1_C4EDCBFA0E37__INCLUDED_)
diff --git a/includes/routing/RoutingReceiveInterface.h b/includes/routing/RoutingReceiveInterface.h
index 33df05b..c1cfc76 100644
--- a/includes/routing/RoutingReceiveInterface.h
+++ b/includes/routing/RoutingReceiveInterface.h
@@ -22,24 +22,26 @@
 *

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

 */

-#if !defined(EA_4264FCC6_2875_4a34_B7B3_1157DD551AF6__INCLUDED_)

-#define EA_4264FCC6_2875_4a34_B7B3_1157DD551AF6__INCLUDED_

+#if !defined(EA_F103F724_CE43_4c5d_A6E5_859230D16B1E__INCLUDED_)

+#define EA_F103F724_CE43_4c5d_A6E5_859230D16B1E__INCLUDED_

 

 #include <vector>

 #include <string>

 #include "../audiomanagertypes.h"

+

 namespace am {

 class DBusWrapper;

 class SocketHandler;

 }

 
 
+#define RoutingReceiveVersion 1
 namespace am {
 	/**
 	 * Routing Receive sendInterface description. This class implements everything from RoutingAdapter -> Audiomanager
 	 * @author christian
 	 * @version 1.0
-	 * @created 22-Dec-2011 12:55:18 AM
+	 * @created 11-Jan-2012 9:54:30 PM
 	 */
 	class RoutingReceiveInterface
 	{
@@ -85,6 +87,13 @@ namespace am {
 		 */
 		virtual void ackSetSourceState(const am_Handle_s handle, const am_Error_e error) =0;
 		/**
+		 * acknowledges asyncSetSinkSoundProperties
+		 * 
+		 * @param handle
+		 * @param error    E_OK on success, E_ABORTED if action was aborted, E_UNKNOWN on error
+		 */
+		virtual void ackSetSinkSoundProperties(const am_Handle_s handle, const am_Error_e error) =0;
+		/**
 		 * acknowledges asyncSetSinkSoundProperty
 		 * 
 		 * @param handle
@@ -92,6 +101,13 @@ namespace am {
 		 */
 		virtual void ackSetSinkSoundProperty(const am_Handle_s handle, const am_Error_e error) =0;
 		/**
+		 * acknowledges asyncSetSourceSoundProperties
+		 * 
+		 * @param handle
+		 * @param error    E_OK on success, E_ABORTED if action was aborted, E_UNKNOWN on error
+		 */
+		virtual void ackSetSourceSoundProperties(const am_Handle_s handle, const am_Error_e error) =0;
+		/**
 		 * acknowledges asyncSetSourceSoundProperty
 		 * 
 		 * @param handle
@@ -301,7 +317,11 @@ namespace am {
 		 * @param socketHandler
 		 */
 		virtual am_Error_e getSocketHandler(SocketHandler*& socketHandler) const =0;
+		/**
+		 * This function returns the version of the interface
+		 */
+		virtual uint16_t getInterfaceVersion() const =0;
 
 	};
 }
-#endif // !defined(EA_4264FCC6_2875_4a34_B7B3_1157DD551AF6__INCLUDED_)
+#endif // !defined(EA_F103F724_CE43_4c5d_A6E5_859230D16B1E__INCLUDED_)
diff --git a/includes/routing/RoutingSendInterface.h b/includes/routing/RoutingSendInterface.h
index 06d4994..9637a08 100644
--- a/includes/routing/RoutingSendInterface.h
+++ b/includes/routing/RoutingSendInterface.h
@@ -22,22 +22,26 @@
 *

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

 */

-#if !defined(EA_BEEEF7D0_77D1_4bb1_8A9D_5E6E127272EE__INCLUDED_)

-#define EA_BEEEF7D0_77D1_4bb1_8A9D_5E6E127272EE__INCLUDED_

+#if !defined(EA_8F359F31_A78B_4e36_B94C_31E6A09C8F67__INCLUDED_)

+#define EA_8F359F31_A78B_4e36_B94C_31E6A09C8F67__INCLUDED_

 

 #include <vector>

 #include <string>

 #include "../audiomanagertypes.h"

-
+

+namespace am {

+class RoutingReceiveInterface;

+}
 
 #include "RoutingReceiveInterface.h"
 
+#define RoutingSendVersion 1
 namespace am {
 	/**
 	 *  This class implements everything from Audiomanager -> RoutingAdapter
 	 * @author christian
 	 * @version 1.0
-	 * @created 22-Dec-2011 12:55:19 AM
+	 * @created 11-Jan-2012 9:22:46 PM
 	 */
 	class RoutingSendInterface
 	{
@@ -120,6 +124,15 @@ namespace am {
 		 * @return E_OK on success, E_UNKNOWN on error, E_OUT_OF_RANGE in case the propery value is out of range
 		 * 
 		 * @param handle
+		 * @param listSoundProperties
+		 * @param sinkID
+		 */
+		virtual am_Error_e asyncSetSinkSoundProperties(const am_Handle_s handle, const std::vector<am_SoundProperty_s>& listSoundProperties, const am_sinkID_t sinkID) =0;
+		/**
+		 * this function sets the sinksoundproperty.

+		 * @return E_OK on success, E_UNKNOWN on error, E_OUT_OF_RANGE in case the propery value is out of range
+		 * 
+		 * @param handle
 		 * @param soundProperty
 		 * @param sinkID
 		 */
@@ -129,6 +142,15 @@ namespace am {
 		 * @return E_OK on success, E_UNKNOWN on error, E_OUT_OF_RANGE in case the propery value is out of range
 		 * 
 		 * @param handle
+		 * @param listSoundProperties
+		 * @param sourceID
+		 */
+		virtual am_Error_e asyncSetSourceSoundProperties(const am_Handle_s handle, const std::vector<am_SoundProperty_s>& listSoundProperties, const am_sourceID_t sourceID) =0;
+		/**
+		 * this function sets the sourcesoundproperty.

+		 * @return E_OK on success, E_UNKNOWN on error, E_OUT_OF_RANGE in case the propery value is out of range
+		 * 
+		 * @param handle
 		 * @param soundProperty
 		 * @param sourceID
 		 */
@@ -159,7 +181,11 @@ namespace am {
 		 * @param BusName
 		 */
 		virtual am_Error_e returnBusName(std::string& BusName) const =0;
+		/**
+		 * This function returns the version of the interface
+		 */
+		virtual uint16_t getInterfaceVersion() const =0;
 
 	};
 }
-#endif // !defined(EA_BEEEF7D0_77D1_4bb1_8A9D_5E6E127272EE__INCLUDED_)
+#endif // !defined(EA_8F359F31_A78B_4e36_B94C_31E6A09C8F67__INCLUDED_)