* formatting all the source code with eclipse source code style

* added used xml to the project 

11 files changed, 335 insertions, 324 deletions

diff --git a/includes/SocketHandler.h b/includes/SocketHandler.h
index db81365..e7e80ba 100644
--- a/includes/SocketHandler.h
+++ b/includes/SocketHandler.h
@@ -1,26 +1,26 @@
 /**
-* Copyright (C) 2011, BMW AG
-*
-* GeniviAudioMananger AudioManagerDaemon
-*
-* \file SocketHandler.h
-*
-* \date 20-Oct-2011 3:42:04 PM
-* \author Christian Mueller (christian.ei.mueller@bmw.de)
-*
-* \section License
-* GNU Lesser General Public License, version 2.1, with special exception (GENIVI clause)
-* Copyright (C) 2011, BMW AG Christian Mueller  Christian.ei.mueller@bmw.de
-*
-* This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation.
-* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License, version 2.1, for more details.
-* You should have received a copy of the GNU Lesser General Public License, version 2.1, along with this program; if not, see <http://www.gnu.org/licenses/lgpl-2.1.html>.
-* Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may also be applicable to programs even in cases in which the program is not a library in the technical sense.
-* Linking AudioManager statically or dynamically with other modules is making a combined work based on AudioManager. You may license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to license your linked modules under the GNU Lesser General Public License, version 2.1, you may use the program under the following exception.
-* As a special exception, the copyright holders of AudioManager give you permission to combine AudioManager with software programs or libraries that are released under any license unless such a combination is not permitted by the license of such a software program or library. You may copy and distribute such a system following the terms of the GNU Lesser General Public License, version 2.1, including this special exception, for AudioManager and the licenses of the other code concerned.
-* Note that people who make modified versions of AudioManager are not obligated to grant this special exception for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, version 2.1, gives permission to release a modified version without this exception; this exception also makes it possible to release a modified version which carries forward this exception.
-*
-*/
+ * Copyright (C) 2011, BMW AG
+ *
+ * GeniviAudioMananger AudioManagerDaemon
+ *
+ * \file SocketHandler.h
+ *
+ * \date 20-Oct-2011 3:42:04 PM
+ * \author Christian Mueller (christian.ei.mueller@bmw.de)
+ *
+ * \section License
+ * GNU Lesser General Public License, version 2.1, with special exception (GENIVI clause)
+ * Copyright (C) 2011, BMW AG Christian Mueller  Christian.ei.mueller@bmw.de
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation.
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License, version 2.1, for more details.
+ * You should have received a copy of the GNU Lesser General Public License, version 2.1, along with this program; if not, see <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ * Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may also be applicable to programs even in cases in which the program is not a library in the technical sense.
+ * Linking AudioManager statically or dynamically with other modules is making a combined work based on AudioManager. You may license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to license your linked modules under the GNU Lesser General Public License, version 2.1, you may use the program under the following exception.
+ * As a special exception, the copyright holders of AudioManager give you permission to combine AudioManager with software programs or libraries that are released under any license unless such a combination is not permitted by the license of such a software program or library. You may copy and distribute such a system following the terms of the GNU Lesser General Public License, version 2.1, including this special exception, for AudioManager and the licenses of the other code concerned.
+ * Note that people who make modified versions of AudioManager are not obligated to grant this special exception for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, version 2.1, gives permission to release a modified version without this exception; this exception also makes it possible to release a modified version which carries forward this exception.
+ *
+ */
 
 #ifndef SOCKETHANDLER_H_
 #define SOCKETHANDLER_H_
@@ -34,12 +34,13 @@
 #include <map>
 #include <signal.h>
 
-namespace am {
+namespace am
+{
 
-static volatile sig_atomic_t gDispatchDone = 0;		//this global is used to stop the mainloop
+static volatile sig_atomic_t gDispatchDone = 0; //this global is used to stop the mainloop
 
-typedef uint16_t sh_timerHandle_t;   	//!<this is a handle for a timer to be used with the SocketHandler
-typedef uint16_t sh_pollHandle_t;		//!<this is a handle for a filedescriptor to be used with the SocketHandler
+typedef uint16_t sh_timerHandle_t; //!<this is a handle for a timer to be used with the SocketHandler
+typedef uint16_t sh_pollHandle_t; //!<this is a handle for a filedescriptor to be used with the SocketHandler
 
 class shPollPrepare;
 class shPollCheck;
@@ -50,85 +51,87 @@ class shTimerCallBack;
 class SocketHandler
 {
 public:
-	SocketHandler();
-	virtual ~SocketHandler();
-
-	am_Error_e addFDPoll(const int fd,const short event, shPollPrepare *prepare,shPollFired *fired,shPollCheck *check,shPollDispatch *dispatch, void* userData,sh_pollHandle_t& handle);
-	am_Error_e removeFDPoll(const sh_pollHandle_t handle);
-	am_Error_e updateEventFlags(const sh_pollHandle_t handle, const short events);
-	am_Error_e addTimer(const timespec timeouts,shTimerCallBack*& callback,sh_timerHandle_t& handle, void* userData);
-	am_Error_e removeTimer(const sh_timerHandle_t handle);
-	am_Error_e restartTimer(const sh_timerHandle_t handle, const timespec timeouts);
-	am_Error_e stopTimer(const sh_timerHandle_t handle);
-	void start_listenting();
-	void stop_listening();
+    SocketHandler();
+    virtual ~SocketHandler();
+
+    am_Error_e addFDPoll(const int fd, const short event, shPollPrepare *prepare, shPollFired *fired, shPollCheck *check, shPollDispatch *dispatch, void* userData, sh_pollHandle_t& handle);
+    am_Error_e removeFDPoll(const sh_pollHandle_t handle);
+    am_Error_e updateEventFlags(const sh_pollHandle_t handle, const short events);
+    am_Error_e addTimer(const timespec timeouts, shTimerCallBack*& callback, sh_timerHandle_t& handle, void* userData);
+    am_Error_e removeTimer(const sh_timerHandle_t handle);
+    am_Error_e restartTimer(const sh_timerHandle_t handle, const timespec timeouts);
+    am_Error_e stopTimer(const sh_timerHandle_t handle);
+    void start_listenting();
+    void stop_listening();
 private:
-	struct timer_s						//!<struct that holds information of timers
-	{
-		sh_timerHandle_t handle;		//!<the handle of the timer
-		timespec countdown;				//!<the countdown, this value is decreased every time the timer is up
-		timespec timeout;				//!<the original timer value
-		shTimerCallBack* callback;	//!<the callbackfunction
-		void * userData;				//!<saves a void pointer together with the rest.
-	};
-
-	class SubstractTime					//!<functor to easy substract from each countdown value
-	{
-	private:
-		timespec param;
-	public:
-		SubstractTime(timespec param): param(param) {}
-		void operator()(timer_s& t) const;
-	};
-
-	struct sh_poll_s						//!<struct that holds information about polls
-	{
-		sh_pollHandle_t handle;				//!<handle to uniquely adress a filedesriptor
-		shPollPrepare *prepareCB;
-		shPollFired *firedCB;
-		shPollCheck *checkCB;
-		shPollDispatch *dispatchCB;
-		pollfd pollfdValue;						//!<the array for polling the filedescriptors
-		void *userData;						//!<userdata saved together with the callback.
-	};
-
-	typedef std::vector<pollfd> mPollfd_t;		//!<vector of filedescriptors
-	typedef std::vector<sh_poll_s> mListPoll_t;	//!<list for the callbacks
-
-	class CopyPollfd
-	{
-	private:
-		mPollfd_t& mArray;
-	public:
-		CopyPollfd(mPollfd_t& dest): mArray(dest) {}
-		void operator()(const sh_poll_s& row);
-	};
-
-	bool fdIsValid(const int fd) const;
-	void initTimer();
-	void timerUp();
-	int timespec2ms(const timespec& time);
-	timespec* insertTime(timespec& buffertime);
-	static bool compareCountdown(const timer_s& a, const timer_s& b)
-	{
-		return (a.countdown.tv_sec==b.countdown.tv_sec) ? (a.countdown.tv_nsec < b.countdown.tv_nsec) : (a.countdown.tv_sec < b.countdown.tv_sec);
-	}
-
-	static bool onlyFiredEvents(const pollfd& a)
-	{
-		return a.revents==0 ? false : true;
-	}
-
-	//todo: maybe we could simplify mListActiveTimer to hold only the handle and the countdown ....
-	mPollfd_t mfdPollingArray;
-	mListPoll_t mListPoll;
-	std::list<timer_s> mListTimer;			//!<list of all timers
-	std::list<timer_s> mListActiveTimer;	//!<list of all currently active timers
-	sh_timerHandle_t mNextTimer;
-	sh_timerHandle_t mLastInsertedHandle;
-	sh_pollHandle_t mLastInsertedPollHandle;
-	timespec mTimeout;
-	bool mRecreatePollfds;
+    struct timer_s //!<struct that holds information of timers
+    {
+        sh_timerHandle_t handle; //!<the handle of the timer
+        timespec countdown; //!<the countdown, this value is decreased every time the timer is up
+        timespec timeout; //!<the original timer value
+        shTimerCallBack* callback; //!<the callbackfunction
+        void * userData; //!<saves a void pointer together with the rest.
+    };
+
+    class SubstractTime //!<functor to easy substract from each countdown value
+    {
+    private:
+        timespec param;
+    public:
+        SubstractTime(timespec param) :
+                param(param){}
+        void operator()(timer_s& t) const;
+    };
+
+    struct sh_poll_s //!<struct that holds information about polls
+    {
+        sh_pollHandle_t handle; //!<handle to uniquely adress a filedesriptor
+        shPollPrepare *prepareCB;
+        shPollFired *firedCB;
+        shPollCheck *checkCB;
+        shPollDispatch *dispatchCB;
+        pollfd pollfdValue; //!<the array for polling the filedescriptors
+        void *userData; //!<userdata saved together with the callback.
+    };
+
+    typedef std::vector<pollfd> mPollfd_t; //!<vector of filedescriptors
+    typedef std::vector<sh_poll_s> mListPoll_t; //!<list for the callbacks
+
+    class CopyPollfd
+    {
+    private:
+        mPollfd_t& mArray;
+    public:
+        CopyPollfd(mPollfd_t& dest) :
+                mArray(dest){}
+        void operator()(const sh_poll_s& row);
+    };
+
+    bool fdIsValid(const int fd) const;
+    void initTimer();
+    void timerUp();
+    int timespec2ms(const timespec& time);
+    timespec* insertTime(timespec& buffertime);
+    static bool compareCountdown(const timer_s& a, const timer_s& b)
+    {
+        return (a.countdown.tv_sec == b.countdown.tv_sec) ? (a.countdown.tv_nsec < b.countdown.tv_nsec) : (a.countdown.tv_sec < b.countdown.tv_sec);
+    }
+
+    static bool onlyFiredEvents(const pollfd& a)
+    {
+        return a.revents == 0 ? false : true;
+    }
+
+    //todo: maybe we could simplify mListActiveTimer to hold only the handle and the countdown ....
+    mPollfd_t mfdPollingArray;
+    mListPoll_t mListPoll;
+    std::list<timer_s> mListTimer; //!<list of all timers
+    std::list<timer_s> mListActiveTimer; //!<list of all currently active timers
+    sh_timerHandle_t mNextTimer;
+    sh_timerHandle_t mLastInsertedHandle;
+    sh_pollHandle_t mLastInsertedPollHandle;
+    timespec mTimeout;
+    bool mRecreatePollfds;
 };
 
 /**
@@ -137,122 +140,127 @@ private:
 class shTimerCallBack
 {
 public:
-	virtual void Call (const sh_timerHandle_t handle, void* userData)=0;
-	virtual ~shTimerCallBack(){};
+    virtual void Call(const sh_timerHandle_t handle, void* userData)=0;
+    virtual ~shTimerCallBack(){};
 };
 
 class shPollPrepare
 {
 public:
-	virtual void Call (const sh_pollHandle_t handle, void* userData)=0;
-	virtual ~shPollPrepare(){};
+    virtual void Call(const sh_pollHandle_t handle, void* userData)=0;
+    virtual ~shPollPrepare(){};
 };
 
 class shPollFired
 {
 public:
-	virtual void Call(const pollfd pollfd,const sh_pollHandle_t handle, void* userData)=0;
-	virtual ~ shPollFired(){};
+    virtual void Call(const pollfd pollfd, const sh_pollHandle_t handle, void* userData)=0;
+    virtual ~ shPollFired(){};
 };
 
 class shPollCheck
 {
 public:
-	virtual bool Call (const sh_pollHandle_t handle, void* userData)=0;
-	virtual ~ shPollCheck(){};
+    virtual bool Call(const sh_pollHandle_t handle, void* userData)=0;
+    virtual ~ shPollCheck(){};
 };
 
 class shPollDispatch
 {
 public:
-	virtual bool Call (const sh_pollHandle_t handle, void* userData)=0;
-	virtual ~ shPollDispatch(){};
+    virtual bool Call(const sh_pollHandle_t handle, void* userData)=0;
+    virtual ~ shPollDispatch() {};
 };
 
 /**
  * template to create the functor for a class
  */
-template <class TClass> class shTimerCallBack_T : public shTimerCallBack
+template<class TClass> class shTimerCallBack_T: public shTimerCallBack
 {
 private:
-	TClass* mInstance;
-	void (TClass::*mFunction)(sh_timerHandle_t handle, void* userData);
+    TClass* mInstance;
+    void (TClass::*mFunction)(sh_timerHandle_t handle, void* userData);
 
 public:
-	shTimerCallBack_T(TClass* instance, void(TClass::*function)(sh_timerHandle_t handle, void* userData))
-	:mInstance(instance), mFunction(function){};
-
-	virtual void Call(sh_timerHandle_t handle, void* userData)
-	{
-		(*mInstance.*mFunction)(handle, userData);
-	}
+    shTimerCallBack_T(TClass* instance, void(TClass::*function)(sh_timerHandle_t handle, void* userData)) :
+            mInstance(instance),//
+            mFunction(function) {};
+
+    virtual void Call(sh_timerHandle_t handle, void* userData)
+    {
+        (*mInstance.*mFunction)(handle, userData);
+    }
 };
 
 /**
  * template to create the functor for a class
  */
-template <class TClass> class shPollPrepare_T : public shPollPrepare
+template<class TClass> class shPollPrepare_T: public shPollPrepare
 {
 private:
-	TClass* mInstance;
-	void (TClass::*mFunction)(const sh_timerHandle_t handle, void* userData);
+    TClass* mInstance;
+    void (TClass::*mFunction)(const sh_timerHandle_t handle, void* userData);
 
 public:
-	shPollPrepare_T(TClass* instance, void(TClass::*function)(const sh_timerHandle_t handle, void* userData))
-	:mInstance(instance), mFunction(function){};
-
-	virtual void Call(const sh_timerHandle_t handle, void* userData)
-	{
-		(*mInstance.*mFunction)(handle,userData);
-	};
+    shPollPrepare_T(TClass* instance, void(TClass::*function)(const sh_timerHandle_t handle, void* userData)) :
+            mInstance(instance), //
+            mFunction(function){};
+
+    virtual void Call(const sh_timerHandle_t handle, void* userData)
+    {
+        (*mInstance.*mFunction)(handle, userData);
+    };
 };
 
-template <class TClass> class shPollFired_T : public shPollFired
+template<class TClass> class shPollFired_T: public shPollFired
 {
 private:
-	TClass* mInstance;
-	void (TClass::*mFunction)(const pollfd pollfd,const sh_pollHandle_t handle, void* userData);
+    TClass* mInstance;
+    void (TClass::*mFunction)(const pollfd pollfd, const sh_pollHandle_t handle, void* userData);
 
 public:
-	shPollFired_T(TClass* instance, void(TClass::*function)(const pollfd pollfd,const sh_pollHandle_t handle, void* userData))
-	:mInstance(instance), mFunction(function){};
-
-	virtual void Call(const pollfd pollfd,const sh_pollHandle_t handle, void* userData)
-	{
-		(*mInstance.*mFunction)(pollfd,handle,userData);
-	};
+    shPollFired_T(TClass* instance, void(TClass::*function)(const pollfd pollfd, const sh_pollHandle_t handle, void* userData)) :
+            mInstance(instance), //
+            mFunction(function){};
+
+    virtual void Call(const pollfd pollfd, const sh_pollHandle_t handle, void* userData)
+    {
+        (*mInstance.*mFunction)(pollfd, handle, userData);
+    };
 };
 
-template <class TClass> class shPollCheck_T : public shPollCheck
+template<class TClass> class shPollCheck_T: public shPollCheck
 {
 private:
-	TClass* mInstance;
-	bool (TClass::*mFunction)(const sh_pollHandle_t handle, void* userData);
+    TClass* mInstance;
+    bool (TClass::*mFunction)(const sh_pollHandle_t handle, void* userData);
 
 public:
-	shPollCheck_T(TClass* instance, bool(TClass::*function)(const sh_pollHandle_t handle, void* userData))
-	:mInstance(instance), mFunction(function){};
-
-	virtual bool Call(const sh_pollHandle_t handle, void* userData)
-	{
-		return (*mInstance.*mFunction)(handle,userData);
-	};
+    shPollCheck_T(TClass* instance, bool(TClass::*function)(const sh_pollHandle_t handle, void* userData)) :
+            mInstance(instance), //
+            mFunction(function){};
+
+    virtual bool Call(const sh_pollHandle_t handle, void* userData)
+    {
+        return (*mInstance.*mFunction)(handle, userData);
+    };
 };
 
-template <class TClass> class shPollDispatch_T : public shPollDispatch
+template<class TClass> class shPollDispatch_T: public shPollDispatch
 {
 private:
-	TClass* mInstance;
-	bool (TClass::*mFunction)(const sh_pollHandle_t handle, void* userData);
+    TClass* mInstance;
+    bool (TClass::*mFunction)(const sh_pollHandle_t handle, void* userData);
 
 public:
-	shPollDispatch_T(TClass* instance, bool (TClass::*function)(const sh_pollHandle_t handle, void* userData))
-	:mInstance(instance), mFunction(function){};
-
-	virtual bool Call(const sh_pollHandle_t handle, void* userData)
-	{
-		return (*mInstance.*mFunction)(handle,userData);
-	};
+    shPollDispatch_T(TClass* instance, bool(TClass::*function)(const sh_pollHandle_t handle, void* userData)) :
+            mInstance(instance), //
+            mFunction(function) {};
+
+    virtual bool Call(const sh_pollHandle_t handle, void* userData)
+    {
+        return (*mInstance.*mFunction)(handle, userData);
+    };
 };
 } /* namespace am */
 #endif /* SOCKETHANDLER_H_ */
diff --git a/includes/audiomanagertypes.cpp b/includes/audiomanagertypes.cpp
deleted file mode 100644
index e69de29..0000000
--- a/includes/audiomanagertypes.cpp
+++ /dev/null
diff --git a/includes/audiomanagertypes.h b/includes/audiomanagertypes.h
index 265a8c7..228c848 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_F71B3C5D_FC1B_400e_A704_C0FF897D4E53__INCLUDED_)

-#define EA_F71B3C5D_FC1B_400e_A704_C0FF897D4E53__INCLUDED_

+#if !defined(EA_3B272E4F_E824_49e3_862F_3C86FD59D14B__INCLUDED_)

+#define EA_3B272E4F_E824_49e3_862F_3C86FD59D14B__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 11-Jan-2012 9:19:44 PM
+	 * @created 19-Jan-2012 4:31:47 PM
 	 */
 	typedef uint16_t am_domainID_t;
 
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 11-Jan-2012 9:19:45 PM
+	 * @created 19-Jan-2012 4:31:47 PM
 	 */
 	typedef uint16_t am_sourceID_t;
 
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 11-Jan-2012 9:19:45 PM
+	 * @created 19-Jan-2012 4:31:48 PM
 	 */
 	typedef uint16_t am_sinkID_t;
 
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 11-Jan-2012 9:19:45 PM
+	 * @created 19-Jan-2012 4:31:48 PM
 	 */
 	typedef uint16_t am_gatewayID_t;
 
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 11-Jan-2012 9:19:46 PM
+	 * @created 19-Jan-2012 4:31:48 PM
 	 */
 	typedef uint16_t am_crossfaderID_t;
 
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 11-Jan-2012 9:19:46 PM
+	 * @created 19-Jan-2012 4:31:48 PM
 	 */
 	typedef uint16_t am_connectionID_t;
 
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 11-Jan-2012 9:19:46 PM
+	 * @created 19-Jan-2012 4:31:49 PM
 	 */
 	typedef uint16_t am_mainConnectionID_t;
 
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 11-Jan-2012 9:19:46 PM
+	 * @created 19-Jan-2012 4:31:49 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 11-Jan-2012 9:19:46 PM
+	 * @created 19-Jan-2012 4:31:49 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 11-Jan-2012 9:19:47 PM
+	 * @created 19-Jan-2012 4:31:49 PM
 	 */
 	typedef int16_t am_mainVolume_t;
 
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 11-Jan-2012 9:19:47 PM
+	 * @created 19-Jan-2012 4:31:50 PM
 	 */
 	typedef uint16_t am_sourceClass_t;
 
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 11-Jan-2012 9:19:47 PM
+	 * @created 19-Jan-2012 4:31:50 PM
 	 */
 	typedef uint16_t am_sinkClass_t;
 
@@ -212,7 +212,7 @@ namespace am {
 	 * time in ms!
 	 * @author christian
 	 * @version 1.0
-	 * @created 11-Jan-2012 9:19:47 PM
+	 * @created 19-Jan-2012 4:31:50 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 11-Jan-2012 9:19:48 PM
+	 * @created 19-Jan-2012 4:31:50 PM
 	 */
 	typedef int16_t am_timeSync_t;
 
@@ -228,7 +228,7 @@ namespace am {
 	 * with the help of this enum, sinks and sources can report their availability state
 	 * @author christian
 	 * @version 1.0
-	 * @created 11-Jan-2012 9:19:48 PM
+	 * @created 19-Jan-2012 4:31:50 PM
 	 */
 	enum am_Availablility_e
 	{
@@ -243,7 +243,7 @@ namespace am {
 	 * represents the connection state
 	 * @author christian
 	 * @version 1.0
-	 * @created 11-Jan-2012 9:19:48 PM
+	 * @created 19-Jan-2012 4:31:50 PM
 	 */
 	enum am_ConnectionState_e
 	{
@@ -274,7 +274,7 @@ namespace am {
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 11-Jan-2012 9:19:48 PM
+	 * @created 19-Jan-2012 4:31:51 PM
 	 */
 	enum am_DomainState_e
 	{
@@ -289,7 +289,7 @@ namespace am {
 	 * This enum characterizes the data of the EarlyData_t
 	 * @author christian
 	 * @version 1.0
-	 * @created 11-Jan-2012 9:19:48 PM
+	 * @created 19-Jan-2012 4:31:51 PM
 	 */
 	enum am_EarlyDataType_e
 	{
@@ -305,7 +305,7 @@ namespace am {
 	 * the errors of the audiomanager. All possible errors are in here. This enum is used widely as return parameter.
 	 * @author christian
 	 * @version 1.0
-	 * @created 11-Jan-2012 9:19:49 PM
+	 * @created 19-Jan-2012 4:31:51 PM
 	 */
 	enum am_Error_e
 	{
@@ -330,7 +330,7 @@ namespace am {
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 11-Jan-2012 9:19:49 PM
+	 * @created 19-Jan-2012 4:31:51 PM
 	 */
 	enum am_MuteState_e
 	{
@@ -344,7 +344,7 @@ namespace am {
 	 * The source state reflects the state of the source
 	 * @author christian
 	 * @version 1.0
-	 * @created 11-Jan-2012 9:19:49 PM
+	 * @created 19-Jan-2012 4:31:52 PM
 	 */
 	enum am_SourceState_e
 	{
@@ -368,7 +368,7 @@ namespace am {
 	 * This enumeration is used to define the type of the action that is correlated to a handle.
 	 * @author christian
 	 * @version 1.0
-	 * @created 11-Jan-2012 9:19:49 PM
+	 * @created 19-Jan-2012 4:31:52 PM
 	 */
 	enum am_Handle_e
 	{
@@ -389,7 +389,7 @@ namespace am {
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 11-Jan-2012 9:19:49 PM
+	 * @created 19-Jan-2012 4:31:52 PM
 	 */
 	enum am_InterruptState_e
 	{
@@ -403,7 +403,7 @@ namespace am {
 	 * describes the active sink of a crossfader.
 	 * @author christian
 	 * @version 1.0
-	 * @created 11-Jan-2012 9:19:49 PM
+	 * @created 19-Jan-2012 4:31:52 PM
 	 */
 	enum am_HotSink_e
 	{
@@ -418,7 +418,7 @@ namespace am {
 	 * this describes the availability of a sink or a source together with the latest change
 	 * @author christian
 	 * @version 1.0
-	 * @created 11-Jan-2012 9:19:50 PM
+	 * @created 19-Jan-2012 4:31:52 PM
 	 */
 	struct am_Availability_s
 	{
@@ -438,7 +438,7 @@ namespace am {
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 11-Jan-2012 9:19:50 PM
+	 * @created 19-Jan-2012 4:31:53 PM
 	 */
 	struct am_ClassProperty_s
 	{
@@ -452,7 +452,7 @@ namespace am {
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 11-Jan-2012 9:19:50 PM
+	 * @created 19-Jan-2012 4:31:53 PM
 	 */
 	struct am_Crossfader_s
 	{
@@ -470,7 +470,7 @@ namespace am {
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 11-Jan-2012 9:19:51 PM
+	 * @created 19-Jan-2012 4:31:53 PM
 	 */
 	struct am_Gateway_s
 	{
@@ -511,7 +511,7 @@ namespace am {
 	 * This represents one "hopp" in a route
 	 * @author christian
 	 * @version 1.0
-	 * @created 11-Jan-2012 9:19:51 PM
+	 * @created 19-Jan-2012 4:31:54 PM
 	 */
 	struct am_RoutingElement_s
 	{
@@ -527,7 +527,7 @@ namespace am {
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 11-Jan-2012 9:19:51 PM
+	 * @created 19-Jan-2012 4:31:54 PM
 	 */
 	struct am_Route_s
 	{
@@ -542,7 +542,7 @@ namespace am {
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 11-Jan-2012 9:19:52 PM
+	 * @created 19-Jan-2012 4:31:54 PM
 	 */
 	struct am_SoundProperty_s
 	{
@@ -556,7 +556,7 @@ namespace am {
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 11-Jan-2012 9:19:52 PM
+	 * @created 19-Jan-2012 4:31:55 PM
 	 */
 	struct am_SystemProperty_s
 	{
@@ -576,7 +576,7 @@ namespace am {
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 11-Jan-2012 9:19:52 PM
+	 * @created 19-Jan-2012 4:31:55 PM
 	 */
 	struct am_SinkClass_s
 	{
@@ -591,7 +591,7 @@ namespace am {
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 11-Jan-2012 9:19:53 PM
+	 * @created 19-Jan-2012 4:31:55 PM
 	 */
 	struct am_SourceClass_s
 	{
@@ -610,7 +610,7 @@ namespace am {
 	 * this type holds all information of sources relevant to the HMI
 	 * @author christian
 	 * @version 1.0
-	 * @created 11-Jan-2012 9:19:53 PM
+	 * @created 19-Jan-2012 4:31:55 PM
 	 */
 	struct am_SourceType_s
 	{
@@ -627,7 +627,7 @@ namespace am {
 	 * this type holds all information of sinks relevant to the HMI
 	 * @author christian
 	 * @version 1.0
-	 * @created 11-Jan-2012 9:19:53 PM
+	 * @created 19-Jan-2012 4:31:56 PM
 	 */
 	struct am_SinkType_s
 	{
@@ -645,7 +645,7 @@ namespace am {
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 11-Jan-2012 9:19:53 PM
+	 * @created 19-Jan-2012 4:31:56 PM
 	 */
 	struct am_Handle_s
 	{
@@ -659,7 +659,7 @@ namespace am {
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 11-Jan-2012 9:19:54 PM
+	 * @created 19-Jan-2012 4:31:56 PM
 	 */
 	struct am_MainSoundProperty_s
 	{
@@ -674,7 +674,7 @@ namespace am {
 	 * this type holds all information of connections relevant to the HMI
 	 * @author christian
 	 * @version 1.0
-	 * @created 11-Jan-2012 9:19:54 PM
+	 * @created 19-Jan-2012 4:31:57 PM
 	 */
 	struct am_MainConnectionType_s
 	{
@@ -691,7 +691,7 @@ namespace am {
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 11-Jan-2012 9:19:54 PM
+	 * @created 19-Jan-2012 4:31:57 PM
 	 */
 	struct am_MainConnection_s
 	{
@@ -707,7 +707,7 @@ namespace am {
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 11-Jan-2012 9:19:55 PM
+	 * @created 19-Jan-2012 4:31:57 PM
 	 */
 	struct am_Sink_s
 	{
@@ -731,7 +731,7 @@ namespace am {
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 11-Jan-2012 9:19:56 PM
+	 * @created 19-Jan-2012 4:31:58 PM
 	 */
 	struct am_Source_s
 	{
@@ -764,7 +764,7 @@ namespace am {
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 11-Jan-2012 9:19:56 PM
+	 * @created 19-Jan-2012 4:31:58 PM
 	 */
 	struct am_Domain_s
 	{
@@ -783,7 +783,7 @@ namespace am {
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 11-Jan-2012 9:19:56 PM
+	 * @created 19-Jan-2012 4:31:59 PM
 	 */
 	struct am_Connection_s
 	{
@@ -803,7 +803,7 @@ namespace am {
 	 * soundProperty_t in case of ED_SOURCE_PROPERTY, ED_SINK_PROPERTY 
 	 * @author christian
 	 * @version 1.0
-	 * @created 11-Jan-2012 9:19:56 PM
+	 * @created 19-Jan-2012 4:31:59 PM
 	 */
 	union am_EarlyData_u
 	{
@@ -820,7 +820,7 @@ namespace am {
 	 * sinkID in case of ED_SINK_VOLUME, ED_SINK_PROPERTY 
 	 * @author christian
 	 * @version 1.0
-	 * @created 11-Jan-2012 9:19:57 PM
+	 * @created 19-Jan-2012 4:31:59 PM
 	 */
 	union am_DataType_u
 	{
@@ -834,7 +834,7 @@ namespace am {
 	/**
 	 * @author christian
 	 * @version 1.0
-	 * @created 11-Jan-2012 9:19:57 PM
+	 * @created 19-Jan-2012 4:31:59 PM
 	 */
 	struct am_EarlyData_s
 	{
@@ -846,4 +846,4 @@ namespace am {
 
 	};
 }
-#endif // !defined(EA_F71B3C5D_FC1B_400e_A704_C0FF897D4E53__INCLUDED_)
+#endif // !defined(EA_3B272E4F_E824_49e3_862F_3C86FD59D14B__INCLUDED_)
diff --git a/includes/command/CommandReceiveInterface.h b/includes/command/CommandReceiveInterface.h
index 9e2aa8a..8821898 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_A90A11B4_5916_4910_AE0C_4F9713F898A1__INCLUDED_)

-#define EA_A90A11B4_5916_4910_AE0C_4F9713F898A1__INCLUDED_

+#if !defined(EA_434BDFE9_DDA7_4273_AF1E_77AE60CB055D__INCLUDED_)

+#define EA_434BDFE9_DDA7_4273_AF1E_77AE60CB055D__INCLUDED_

 

 #include <vector>

 #include <string>

@@ -40,7 +40,7 @@ namespace am {
 	 * The interface towards the Controlling Instance (e.g HMI). It handles the communication towards the HMI and other system components who need to interact with the audiomanagement.
 	 * @author christian
 	 * @version 1.0
-	 * @created 11-Jan-2012 9:19:57 PM
+	 * @created 19-Jan-2012 4:32:00 PM
 	 */
 	class CommandReceiveInterface
 	{
@@ -196,4 +196,4 @@ namespace am {
 
 	};
 }
-#endif // !defined(EA_A90A11B4_5916_4910_AE0C_4F9713F898A1__INCLUDED_)
+#endif // !defined(EA_434BDFE9_DDA7_4273_AF1E_77AE60CB055D__INCLUDED_)
diff --git a/includes/command/CommandSendInterface.h b/includes/command/CommandSendInterface.h
index 8ae8b50..160db6c 100644
--- a/includes/command/CommandSendInterface.h
+++ b/includes/command/CommandSendInterface.h
@@ -22,8 +22,8 @@
 *

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

 */

-#if !defined(EA_B654AC7A_A617_46d0_836D_36974F99E750__INCLUDED_)

-#define EA_B654AC7A_A617_46d0_836D_36974F99E750__INCLUDED_

+#if !defined(EA_55B59518_08CD_47c3_91EC_B59681773D46__INCLUDED_)

+#define EA_55B59518_08CD_47c3_91EC_B59681773D46__INCLUDED_

 

 #include <vector>

 #include <string>

@@ -33,13 +33,15 @@ namespace am {
 class CommandReceiveInterface;

 }
 
+#include "CommandReceiveInterface.h"
+
 #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 11-Jan-2012 9:19:58 PM
+	 * @created 19-Jan-2012 4:32:00 PM
 	 */
 	class CommandSendInterface
 	{
@@ -155,4 +157,4 @@ namespace am {
 
 	};
 }
-#endif // !defined(EA_B654AC7A_A617_46d0_836D_36974F99E750__INCLUDED_)
+#endif // !defined(EA_55B59518_08CD_47c3_91EC_B59681773D46__INCLUDED_)
diff --git a/includes/config.h b/includes/config.h
index db5b56d..f741d75 100644
--- a/includes/config.h
+++ b/includes/config.h
@@ -1,14 +1,14 @@
 #ifndef _CONFIG_H
 #define _CONFIG_H
 
-#define DAEMONVERSION "ver-0.0.1-11-g64ba8be"
+#define DAEMONVERSION "ver-0.0.1-12-g80213f1"
 
 #define WITH_DBUS_WRAPPER
 #define WITH_SOCKETHANDLER_LOOP 
 /* #undef WITH_SIMPLEDBUS_LOOP */
 #define WITH_PPOLL
 /* #undef WITH_TELNET */
-/* #undef GLIB_DBUS_TYPES_TOLERANT */
+#define GLIB_DBUS_TYPES_TOLERANT
 
 #define DEFAULT_PLUGIN_COMMAND_DIR "/home/christian/workspace/AudioManager/bin/plugins/command"
 #define DEFAULT_PLUGIN_ROUTING_DIR "/home/christian/workspace/AudioManager/bin/plugins/routing"
diff --git a/includes/control/ControlReceiveInterface.h b/includes/control/ControlReceiveInterface.h
index 9478794..85fda32 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_1D9028B1_EE8B_4860_B728_B37C63BA3D03__INCLUDED_)

-#define EA_1D9028B1_EE8B_4860_B728_B37C63BA3D03__INCLUDED_

+#if !defined(EA_E6AC61AD_E107_4b3d_8E11_9A434157C19F__INCLUDED_)

+#define EA_E6AC61AD_E107_4b3d_8E11_9A434157C19F__INCLUDED_

 

 #include <vector>

 #include <string>

@@ -39,7 +39,7 @@ namespace am {
 	 * This interface gives access to all important functions of the audiomanager that are used by the AudioManagerController to control the system.
 	 * @author christian
 	 * @version 1.0
-	 * @created 11-Jan-2012 9:19:58 PM
+	 * @created 19-Jan-2012 4:32:00 PM
 	 */
 	class ControlReceiveInterface
 	{
@@ -562,4 +562,4 @@ namespace am {
 
 	};
 }
-#endif // !defined(EA_1D9028B1_EE8B_4860_B728_B37C63BA3D03__INCLUDED_)
+#endif // !defined(EA_E6AC61AD_E107_4b3d_8E11_9A434157C19F__INCLUDED_)
diff --git a/includes/dbus/DBusWrapper.h b/includes/dbus/DBusWrapper.h
index 6999e38..528d111 100644
--- a/includes/dbus/DBusWrapper.h
+++ b/includes/dbus/DBusWrapper.h
@@ -1,104 +1,105 @@
 /**
-* Copyright (C) 2011, BMW AG
-*
-* GeniviAudioMananger AudioManagerDaemon
-*
-* \file DBusWrapper.h
-*
-* \date 20-Oct-2011 3:42:04 PM
-* \author Christian Mueller (christian.ei.mueller@bmw.de)
-*
-* \section License
-* GNU Lesser General Public License, version 2.1, with special exception (GENIVI clause)
-* Copyright (C) 2011, BMW AG Christian Mueller  Christian.ei.mueller@bmw.de
-*
-* This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation.
-* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License, version 2.1, for more details.
-* You should have received a copy of the GNU Lesser General Public License, version 2.1, along with this program; if not, see <http://www.gnu.org/licenses/lgpl-2.1.html>.
-* Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may also be applicable to programs even in cases in which the program is not a library in the technical sense.
-* Linking AudioManager statically or dynamically with other modules is making a combined work based on AudioManager. You may license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to license your linked modules under the GNU Lesser General Public License, version 2.1, you may use the program under the following exception.
-* As a special exception, the copyright holders of AudioManager give you permission to combine AudioManager with software programs or libraries that are released under any license unless such a combination is not permitted by the license of such a software program or library. You may copy and distribute such a system following the terms of the GNU Lesser General Public License, version 2.1, including this special exception, for AudioManager and the licenses of the other code concerned.
-* Note that people who make modified versions of AudioManager are not obligated to grant this special exception for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, version 2.1, gives permission to release a modified version without this exception; this exception also makes it possible to release a modified version which carries forward this exception.
-*
-* THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN
-*/
+ * Copyright (C) 2011, BMW AG
+ *
+ * GeniviAudioMananger AudioManagerDaemon
+ *
+ * \file DBusWrapper.h
+ *
+ * \date 20-Oct-2011 3:42:04 PM
+ * \author Christian Mueller (christian.ei.mueller@bmw.de)
+ *
+ * \section License
+ * GNU Lesser General Public License, version 2.1, with special exception (GENIVI clause)
+ * Copyright (C) 2011, BMW AG Christian Mueller  Christian.ei.mueller@bmw.de
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation.
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License, version 2.1, for more details.
+ * You should have received a copy of the GNU Lesser General Public License, version 2.1, along with this program; if not, see <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ * Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may also be applicable to programs even in cases in which the program is not a library in the technical sense.
+ * Linking AudioManager statically or dynamically with other modules is making a combined work based on AudioManager. You may license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to license your linked modules under the GNU Lesser General Public License, version 2.1, you may use the program under the following exception.
+ * As a special exception, the copyright holders of AudioManager give you permission to combine AudioManager with software programs or libraries that are released under any license unless such a combination is not permitted by the license of such a software program or library. You may copy and distribute such a system following the terms of the GNU Lesser General Public License, version 2.1, including this special exception, for AudioManager and the licenses of the other code concerned.
+ * Note that people who make modified versions of AudioManager are not obligated to grant this special exception for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, version 2.1, gives permission to release a modified version without this exception; this exception also makes it possible to release a modified version which carries forward this exception.
+ *
+ * THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN
+ */
 
 #ifndef DBUSWRAPPER_H_
 #define DBUSWRAPPER_H_
 
-
 #include <config.h>
 #include <SocketHandler.h>
 #include <dbus/dbus.h>
 #include <string>
 #include <list>
 
-namespace am {
+namespace am
+{
 /**
  * This wraps dbus and provides everything needed to anyone who wants to use dbus (including plugins)
  */
-class DBusWrapper {
+class DBusWrapper
+{
 public:
-	DBusWrapper();
-	DBusWrapper(SocketHandler* socketHandler);
-	virtual ~DBusWrapper();
-
-	/**
-	 * registers a callback that is entered as path below the main path.
-	 * The configuration of the mainpath is done via DBusConfiguration.h
-	 * @param vtable the vtable that holds a pointer to the callback that is called when the path is called from the dbus
-	 * @param path the name of the path
-	 * @param userdata pointer to the class that will handle the callback
-	 */
-	void registerCallback(const DBusObjectPathVTable* vtable, const std::string& path, void* userdata);
-
-	/**
-	 * returns the dbus connection
-	 * @param connection pointer to the connection
-	 */
-	void getDBusConnection(DBusConnection*& connection) const;
-
-	/**
-	 * If Dbus is used, this MainLoop must be called as mainloop, otherwise the messages are not dispatched.
-	 */
-	void dbusMainLoop();
-
-	static dbus_bool_t addWatch(DBusWatch *watch, void *userData);
-	static void removeWatch(DBusWatch *watch, void *userData);
-	static void toogleWatch(DBusWatch *watch, void *userData);
-
-	static dbus_bool_t addTimeout(DBusTimeout *timeout,void* userData);
-	static void removeTimeout(DBusTimeout *timeout, void* userData);
-	static void toggleTimeout(DBusTimeout *timeout, void* userData);
-
-	bool dbusDispatchCallback(const sh_pollHandle_t handle, void* userData);
-	shPollDispatch_T<DBusWrapper> pDbusDispatchCallback;
-
-	bool dbusCheckCallback(const sh_pollHandle_t handle, void* userData);
-	shPollCheck_T<DBusWrapper> pDbusCheckCallback;
-
-	void dbusFireCallback(const pollfd pollfd,const sh_pollHandle_t handle, void* userData);
-	shPollFired_T<DBusWrapper> pDbusFireCallback;
-
-	void dbusTimerCallback(sh_timerHandle_t handle, void* userData);
-	shTimerCallBack_T<DBusWrapper> pDbusTimerCallback;
+    DBusWrapper();
+    DBusWrapper(SocketHandler* socketHandler);
+    virtual ~DBusWrapper();
+
+    /**
+     * registers a callback that is entered as path below the main path.
+     * The configuration of the mainpath is done via DBusConfiguration.h
+     * @param vtable the vtable that holds a pointer to the callback that is called when the path is called from the dbus
+     * @param path the name of the path
+     * @param userdata pointer to the class that will handle the callback
+     */
+    void registerCallback(const DBusObjectPathVTable* vtable, const std::string& path, void* userdata);
+
+    /**
+     * returns the dbus connection
+     * @param connection pointer to the connection
+     */
+    void getDBusConnection(DBusConnection*& connection) const;
+
+    /**
+     * If Dbus is used, this MainLoop must be called as mainloop, otherwise the messages are not dispatched.
+     */
+    void dbusMainLoop();
+
+    static dbus_bool_t addWatch(DBusWatch *watch, void *userData);
+    static void removeWatch(DBusWatch *watch, void *userData);
+    static void toogleWatch(DBusWatch *watch, void *userData);
+
+    static dbus_bool_t addTimeout(DBusTimeout *timeout, void* userData);
+    static void removeTimeout(DBusTimeout *timeout, void* userData);
+    static void toggleTimeout(DBusTimeout *timeout, void* userData);
+
+    bool dbusDispatchCallback(const sh_pollHandle_t handle, void* userData);
+    shPollDispatch_T<DBusWrapper> pDbusDispatchCallback;
+
+    bool dbusCheckCallback(const sh_pollHandle_t handle, void* userData);
+    shPollCheck_T<DBusWrapper> pDbusCheckCallback;
+
+    void dbusFireCallback(const pollfd pollfd, const sh_pollHandle_t handle, void* userData);
+    shPollFired_T<DBusWrapper> pDbusFireCallback;
+
+    void dbusTimerCallback(sh_timerHandle_t handle, void* userData);
+    shTimerCallBack_T<DBusWrapper> pDbusTimerCallback;
 
 private:
     static DBusWrapper* mReference;
-	static DBusHandlerResult cbRootIntrospection(DBusConnection *conn, DBusMessage *msg, void *reference);
-	dbus_bool_t addWatchDelegate(DBusWatch * watch,void* userData);
-	void removeWatchDelegate(DBusWatch *watch, void *userData);
-	void toogleWatchDelegate(DBusWatch *watch, void *userData);
-	dbus_bool_t addTimeoutDelegate(DBusTimeout *timeout,void* userData);
-	void removeTimeoutDelegate(DBusTimeout *timeout, void* userData);
-	void toggleTimeoutDelegate(DBusTimeout *timeout, void* userData);
-	DBusObjectPathVTable mObjectPathVTable;
+    static DBusHandlerResult cbRootIntrospection(DBusConnection *conn, DBusMessage *msg, void *reference);
+    dbus_bool_t addWatchDelegate(DBusWatch * watch, void* userData);
+    void removeWatchDelegate(DBusWatch *watch, void *userData);
+    void toogleWatchDelegate(DBusWatch *watch, void *userData);
+    dbus_bool_t addTimeoutDelegate(DBusTimeout *timeout, void* userData);
+    void removeTimeoutDelegate(DBusTimeout *timeout, void* userData);
+    void toggleTimeoutDelegate(DBusTimeout *timeout, void* userData);
+    DBusObjectPathVTable mObjectPathVTable;
     DBusConnection* mDbusConnection;
     DBusError mDBusError;
     std::list<std::string> mNodesList;
     std::vector<sh_timerHandle_t*> mListTimerhandlePointer;
     SocketHandler *mSocketHandler;
-    std::map<DBusWatch*,sh_pollHandle_t> mMapHandleWatch;
+    std::map<DBusWatch*, sh_pollHandle_t> mMapHandleWatch;
 };
 
 }
diff --git a/includes/projecttypes.h b/includes/projecttypes.h
index a50e92c..6e463b9 100644
--- a/includes/projecttypes.h
+++ b/includes/projecttypes.h
@@ -22,15 +22,15 @@
 *

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

 */

-#if !defined(EA_D30EA3FF_652C_41f2_84C1_C4EDCBFA0E37__INCLUDED_)

-#define EA_D30EA3FF_652C_41f2_84C1_C4EDCBFA0E37__INCLUDED_

+#if !defined(EA_D441AD1F_B077_485c_AE04_AF1567A1359F__INCLUDED_)

+#define EA_D441AD1F_B077_485c_AE04_AF1567A1359F__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 11-Jan-2012 9:19:57 PM

+	 * @created 19-Jan-2012 4:31:59 PM

 	 */

 	enum am_ConnectionFormat_e

 	{

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

 	 * @author christian

 	 * @version 1.0

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

+	 * @created 19-Jan-2012 4:31:59 PM

 	 */

 	enum am_AvailabilityReason_e

 	{

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

 	 * @author christian

 	 * @version 1.0

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

+	 * @created 19-Jan-2012 4:31:59 PM

 	 */

 	enum am_ClassProperty_e

 	{

@@ -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 11-Jan-2012 9:19:57 PM
+	 * @created 19-Jan-2012 4:31:59 PM
 	 */
 	enum am_RampType_e
 	{
@@ -106,7 +106,7 @@ 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 11-Jan-2012 9:19:57 PM
+	 * @created 19-Jan-2012 4:31:59 PM
 	 */
 	enum am_SoundPropertyType_e
 	{
@@ -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 11-Jan-2012 9:19:57 PM
+	 * @created 19-Jan-2012 4:31:59 PM
 	 */
 	enum am_MainSoundPropertyType_e
 	{
@@ -138,7 +138,7 @@ namespace am {
 	 * describes the different system properties. Project specific
 	 * @author christian
 	 * @version 1.0
-	 * @created 11-Jan-2012 9:19:57 PM
+	 * @created 19-Jan-2012 4:31:59 PM
 	 */
 	enum am_SystemPropertyType_e
 	{
@@ -147,4 +147,4 @@ namespace am {
 		SYP_MIN = SYP_TEST
 	};
 }
-#endif // !defined(EA_D30EA3FF_652C_41f2_84C1_C4EDCBFA0E37__INCLUDED_)
+#endif // !defined(EA_D441AD1F_B077_485c_AE04_AF1567A1359F__INCLUDED_)
diff --git a/includes/routing/RoutingReceiveInterface.h b/includes/routing/RoutingReceiveInterface.h
index c1cfc76..13752c4 100644
--- a/includes/routing/RoutingReceiveInterface.h
+++ b/includes/routing/RoutingReceiveInterface.h
@@ -22,8 +22,8 @@
 *

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

 */

-#if !defined(EA_F103F724_CE43_4c5d_A6E5_859230D16B1E__INCLUDED_)

-#define EA_F103F724_CE43_4c5d_A6E5_859230D16B1E__INCLUDED_

+#if !defined(EA_5AC7DCDD_B4FD_44d2_8783_CC96D8595F43__INCLUDED_)

+#define EA_5AC7DCDD_B4FD_44d2_8783_CC96D8595F43__INCLUDED_

 

 #include <vector>

 #include <string>

@@ -41,7 +41,7 @@ namespace am {
 	 * Routing Receive sendInterface description. This class implements everything from RoutingAdapter -> Audiomanager
 	 * @author christian
 	 * @version 1.0
-	 * @created 11-Jan-2012 9:54:30 PM
+	 * @created 19-Jan-2012 4:32:01 PM
 	 */
 	class RoutingReceiveInterface
 	{
@@ -324,4 +324,4 @@ namespace am {
 
 	};
 }
-#endif // !defined(EA_F103F724_CE43_4c5d_A6E5_859230D16B1E__INCLUDED_)
+#endif // !defined(EA_5AC7DCDD_B4FD_44d2_8783_CC96D8595F43__INCLUDED_)
diff --git a/includes/routing/RoutingSendInterface.h b/includes/routing/RoutingSendInterface.h
index 9637a08..ac4b6ab 100644
--- a/includes/routing/RoutingSendInterface.h
+++ b/includes/routing/RoutingSendInterface.h
@@ -22,8 +22,8 @@
 *

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

 */

-#if !defined(EA_8F359F31_A78B_4e36_B94C_31E6A09C8F67__INCLUDED_)

-#define EA_8F359F31_A78B_4e36_B94C_31E6A09C8F67__INCLUDED_

+#if !defined(EA_D17051E6_21F6_42a8_A7D0_F996E885E15F__INCLUDED_)

+#define EA_D17051E6_21F6_42a8_A7D0_F996E885E15F__INCLUDED_

 

 #include <vector>

 #include <string>

@@ -41,7 +41,7 @@ namespace am {
 	 *  This class implements everything from Audiomanager -> RoutingAdapter
 	 * @author christian
 	 * @version 1.0
-	 * @created 11-Jan-2012 9:22:46 PM
+	 * @created 19-Jan-2012 4:32:02 PM
 	 */
 	class RoutingSendInterface
 	{
@@ -188,4 +188,4 @@ namespace am {
 
 	};
 }
-#endif // !defined(EA_8F359F31_A78B_4e36_B94C_31E6A09C8F67__INCLUDED_)
+#endif // !defined(EA_D17051E6_21F6_42a8_A7D0_F996E885E15F__INCLUDED_)