* fix [GAM-28] problems in routingsender.cpp

* [GAM-27] major refactoring: bringing everything to standardized names
* Enhancement of CAmSerializer.h
* improvement of documentation
* adoption & regeneration of inerfaces

3 files changed, 372 insertions, 443 deletions

diff --git a/PluginRoutingInterfaceAsync/src/RoutingSenderAsync.cpp b/PluginRoutingInterfaceAsync/src/CAmRoutingSenderAsync.cpp
index 68b260f..31e5948 100644
--- a/PluginRoutingInterfaceAsync/src/RoutingSenderAsync.cpp
+++ b/PluginRoutingInterfaceAsync/src/CAmRoutingSenderAsync.cpp
@@ -3,7 +3,7 @@
  *
  * GeniviAudioMananger DbusPlugin
  *
- * \file RoutingSender.cpp
+ * \file CAmRoutingSender.cpp
  *
  * \date 20-Oct-2011 3:42:04 PM
  * \author Christian Mueller (christian.ei.mueller@bmw.de)
@@ -22,8 +22,7 @@
  *
  */
 
-#include "RoutingSenderAsyn.h"
-#include "DLTWrapper.h"
+#include "CAmRoutingSenderAsync.h"
 #include <algorithm>
 #include <vector>
 #include <poll.h>
@@ -33,255 +32,178 @@
 #include <sstream>
 #include <string>
 #include <dbus/dbus.h>
+#include "shared/CAmDltWrapper.h"
 
 using namespace am;
 
 DLT_DECLARE_CONTEXT(PluginRoutingAsync)
 
-extern "C" RoutingSendInterface* PluginRoutingInterfaceAsyncFactory()
+extern "C" IAmRoutingSend* PluginRoutingInterfaceAsyncFactory()
 {
-    return (new AsyncRoutingSender());
+    return (new CAmRoutingSenderAsync());
 }
 
-extern "C" void destroyRoutingPluginInterfaceAsync(RoutingSendInterface* routingSendInterface)
+extern "C" void destroyRoutingPluginInterfaceAsync(IAmRoutingSend* routingSendInterface)
 {
     delete routingSendInterface;
 }
 
-pthread_mutex_t AsyncRoutingSender::mMapConnectionMutex = PTHREAD_MUTEX_INITIALIZER;
-pthread_mutex_t AsyncRoutingSender::mMapHandleWorkerMutex = PTHREAD_MUTEX_INITIALIZER;
-pthread_mutex_t AsyncRoutingSender::mSinksMutex= PTHREAD_MUTEX_INITIALIZER;
-pthread_mutex_t AsyncRoutingSender::mSourcesMutex= PTHREAD_MUTEX_INITIALIZER;
-pthread_mutex_t AsyncRoutingSender::mDomainsMutex= PTHREAD_MUTEX_INITIALIZER;
-pthread_mutex_t WorkerThreadPool::mBlockingMutex = PTHREAD_MUTEX_INITIALIZER;
-
-//void* AsyncRoutingSender::InterruptEvents(void *data)
-//{
-//    RoutingReceiverAsyncShadow *shadow=(RoutingReceiverAsyncShadow *)data;
-//    DBusError err;
-//    DBusMessage* msg;
-//    DBusConnection* conn;
-//    dbus_error_init(&err);
-//    conn = dbus_bus_get(DBUS_BUS_SESSION, &err);
-//    dbus_uint32_t serial = 0;
-//    DBusMessage* reply;
-//    DBusMessageIter args;
-//    dbus_bus_request_name(conn, "org.genivi.test",DBUS_NAME_FLAG_REPLACE_EXISTING , &err);
-//
-//    while (dbus_connection_read_write_dispatch(conn, -1))
-//    {
-//        dbus_connection_read_write(conn, 0);
-//        msg = dbus_connection_pop_message(conn);
-//
-//        if (dbus_message_is_method_call(msg, "org.genivi.test", "timingChanged"))
-//        {
-//            am_connectionID_t connectionID;
-//            am_timeSync_t delay;
-//            dbus_message_iter_init(msg, &args);
-//            dbus_message_iter_get_basic(&args,(void*) &connectionID);
-//            dbus_message_iter_next(&args);
-//            dbus_message_iter_get_basic(&args,(void*) &delay);
-//            reply = dbus_message_new_method_return(msg);
-//            dbus_message_iter_init_append(reply, &args);
-//            dbus_message_iter_append_basic(&args, DBUS_TYPE_INT32, &connectionID);
-//            dbus_connection_send(conn, reply, &serial);
-//            shadow->hookTimingInformationChanged(connectionID,delay);
-//            dbus_message_unref(reply);
-//        }
-//        else if (dbus_message_is_method_call(msg, "org.genivi.test", "SinkAvailablityStatusChange"))
-//        {
-//            am_sinkID_t sinkID;
-//            am_Availability_s availability;
-//            dbus_message_iter_init(msg, &args);
-//            dbus_message_iter_get_basic(&args,(void*) &sinkID);
-//            reply = dbus_message_new_method_return(msg);
-//            dbus_message_iter_init_append(reply, &args);
-//            dbus_message_iter_append_basic(&args, DBUS_TYPE_INT32, &sinkID);
-//            dbus_connection_send(conn, reply, &serial);
-//            shadow->hookSinkAvailablityStatusChange(sinkID,availability);
-//            dbus_message_unref(reply);
-//        }
-//        else if (dbus_message_is_method_call(msg, "org.genivi.test", "SourceAvailablityStatusChange"))
-//        {
-//            am_sourceID_t sourceID;
-//            am_Availability_s availability;
-//            dbus_message_iter_init(msg, &args);
-//            dbus_message_iter_get_basic(&args,(void*) &sourceID);
-//            reply = dbus_message_new_method_return(msg);
-//            dbus_message_iter_init_append(reply, &args);
-//            dbus_message_iter_append_basic(&args, DBUS_TYPE_INT32, &sourceID);
-//            dbus_connection_send(conn, reply, &serial);
-//            shadow->hookSourceAvailablityStatusChange(sourceID,availability);
-//            dbus_message_unref(reply);
-//        }
-//        else if (dbus_message_is_method_call(msg, "org.genivi.test", "InterruptStatusChange"))
-//        {
-//            am_sourceID_t sourceID;
-//
-//            am_InterruptState_e state=IS_UNKNOWN;
-//            dbus_message_iter_init(msg, &args);
-//            dbus_message_iter_get_basic(&args,(void*) &sourceID);
-//            reply = dbus_message_new_method_return(msg);
-//            dbus_message_iter_init_append(reply, &args);
-//            dbus_message_iter_append_basic(&args, DBUS_TYPE_INT32, &sourceID);
-//            dbus_connection_send(conn, reply, &serial);
-//            shadow->hookInterruptStatusChange(sourceID,state);
-//            dbus_message_unref(reply);
-//        }
-//        dbus_connection_flush(conn);
-//    }
-//    return NULL;
-//}
-
-        void *WorkerThreadPool::WorkerThread(void* data)
-        {
-            threadInfo_s *myInfo=(threadInfo_s*)data;
-            while (1)
-            {
-                sem_wait(&myInfo->block);
-                pthread_mutex_lock(&mBlockingMutex);
-                Worker* actWorker=myInfo->worker;
-                pthread_mutex_unlock(&mBlockingMutex);
-                actWorker->setCancelSempaphore(&myInfo->cancel);
-                actWorker->start2work();
-                actWorker->pPool->finishedWork(myInfo->threadID);
-            }
-            return NULL;
-        }
+pthread_mutex_t CAmRoutingSenderAsync::mMapConnectionMutex = PTHREAD_MUTEX_INITIALIZER;
+pthread_mutex_t CAmRoutingSenderAsync::mMapHandleWorkerMutex = PTHREAD_MUTEX_INITIALIZER;
+pthread_mutex_t CAmRoutingSenderAsync::mSinksMutex= PTHREAD_MUTEX_INITIALIZER;
+pthread_mutex_t CAmRoutingSenderAsync::mSourcesMutex= PTHREAD_MUTEX_INITIALIZER;
+pthread_mutex_t CAmRoutingSenderAsync::mDomainsMutex= PTHREAD_MUTEX_INITIALIZER;
+pthread_mutex_t CAmWorkerThreadPool::mBlockingMutex = PTHREAD_MUTEX_INITIALIZER;
 
-        WorkerThreadPool::WorkerThreadPool(int numThreads):
-        mNumThreads(numThreads)
-        {
-            int workerID=0;
-            mListWorkers.resize(mNumThreads);
-            for (int i=0;i<mNumThreads;i++)
-            {
-                sem_init(&mListWorkers[i].block,NULL,NULL);
-                sem_init(&mListWorkers[i].cancel,NULL,NULL);
-                mListWorkers[i].busy=false;
-                mListWorkers[i].workerID=++workerID;
-                pthread_create(&mListWorkers[i].threadID,NULL,&WorkerThreadPool::WorkerThread,(void*)&mListWorkers[i]);
-            }
-        }
+void *CAmWorkerThreadPool::CAmWorkerThread(void* data)
+{
+    threadInfo_s *myInfo=(threadInfo_s*)data;
+    while (1)
+    {
+        sem_wait(&myInfo->block);
+        pthread_mutex_lock(&mBlockingMutex);
+        CAmWorker* actWorker=myInfo->worker;
+        pthread_mutex_unlock(&mBlockingMutex);
+        actWorker->setCancelSempaphore(&myInfo->cancel);
+        actWorker->start2work();
+        actWorker->pPool->finishedWork(myInfo->threadID);
+    }
+    return NULL;
+}
 
-        int16_t WorkerThreadPool::startWork(Worker *worker)
+CAmWorkerThreadPool::CAmWorkerThreadPool(int numThreads):
+mNumThreads(numThreads)
+{
+    int workerID=0;
+    mListWorkers.resize(mNumThreads);
+    for (int i=0;i<mNumThreads;i++)
+    {
+        sem_init(&mListWorkers[i].block,NULL,NULL);
+        sem_init(&mListWorkers[i].cancel,NULL,NULL);
+        mListWorkers[i].busy=false;
+        mListWorkers[i].workerID=++workerID;
+        pthread_create(&mListWorkers[i].threadID,NULL,&CAmWorkerThreadPool::CAmWorkerThread,(void*)&mListWorkers[i]);
+    }
+}
+
+int16_t CAmWorkerThreadPool::startWork(CAmWorker *worker)
+{
+    pthread_mutex_lock(&mBlockingMutex);
+    std::vector<threadInfo_s>::iterator it=mListWorkers.begin();
+    for(;it!=mListWorkers.end();++it)
+    {
+        if(!it->busy)
         {
-            pthread_mutex_lock(&mBlockingMutex);
-            std::vector<threadInfo_s>::iterator it=mListWorkers.begin();
-            for(;it!=mListWorkers.end();++it)
-            {
-                if(!it->busy)
-                {
-                    it->worker=worker;
-                    it->busy=true;
-                    pthread_mutex_unlock(&mBlockingMutex);
-                    sem_post(&it->block);
-                    return ((int)it->workerID);
-                }
-            }
+            it->worker=worker;
+            it->busy=true;
             pthread_mutex_unlock(&mBlockingMutex);
-            return (-1);
+            sem_post(&it->block);
+            return ((int)it->workerID);
         }
+    }
+    pthread_mutex_unlock(&mBlockingMutex);
+    return (-1);
+}
 
-        bool WorkerThreadPool::cancelWork(int workerID)
+bool CAmWorkerThreadPool::cancelWork(int workerID)
+{
+    std::vector<threadInfo_s>::iterator it=mListWorkers.begin();
+    for(;it!=mListWorkers.end();++it)
+    {
+        if(it->workerID==workerID && it->busy)
         {
-            std::vector<threadInfo_s>::iterator it=mListWorkers.begin();
-            for(;it!=mListWorkers.end();++it)
-            {
-                if(it->workerID==workerID && it->busy)
-                {
-                    sem_post(&it->cancel);
-                    return (true);
-                }
-            }
-            return (false);
+            sem_post(&it->cancel);
+            return (true);
         }
+    }
+    return (false);
+}
 
-        void WorkerThreadPool::finishedWork(pthread_t threadID)
+void CAmWorkerThreadPool::finishedWork(pthread_t threadID)
+{
+    pthread_mutex_lock(&mBlockingMutex);
+    std::vector<threadInfo_s>::iterator it=mListWorkers.begin();
+    for(;it!=mListWorkers.end();++it)
+    {
+        if(it->threadID==threadID)
         {
-            pthread_mutex_lock(&mBlockingMutex);
-            std::vector<threadInfo_s>::iterator it=mListWorkers.begin();
-            for(;it!=mListWorkers.end();++it)
-            {
-                if(it->threadID==threadID)
-                {
-                    it->busy=false;
-                    delete it->worker;
-                    break;
-                }
-            }
-            pthread_mutex_unlock(&mBlockingMutex);
+            it->busy=false;
+            delete it->worker;
+            break;
         }
+    }
+    pthread_mutex_unlock(&mBlockingMutex);
+}
 
-        WorkerThreadPool::~WorkerThreadPool()
-        {
-            for (int i=0;i<mNumThreads;i++)
-            {
-                pthread_cancel(mListWorkers[i].threadID);
-            }
-        }
+CAmWorkerThreadPool::~CAmWorkerThreadPool()
+{
+    for (int i=0;i<mNumThreads;i++)
+    {
+        pthread_cancel(mListWorkers[i].threadID);
+    }
+}
 
-        Worker::Worker(WorkerThreadPool *pool):
-        pPool(pool), mCancelSem()
-        {
-        }
+CAmWorker::CAmWorker(CAmWorkerThreadPool *pool):
+pPool(pool), mCancelSem()
+{
+}
 
-        void Worker::setCancelSempaphore(sem_t* cancel)
-        {
-            mCancelSem=cancel;
-        }
+void CAmWorker::setCancelSempaphore(sem_t* cancel)
+{
+    mCancelSem=cancel;
+}
 
-        bool Worker::timedWait(timespec timer)
-        {
-            timespec temp;
-            if(clock_gettime(0, &temp)==-1)
-            {
-                logError("Worker::timedWait error on getting time");
-            }
-            temp.tv_nsec+=timer.tv_nsec;
-            temp.tv_sec+=timer.tv_sec;
-            //if(sem_wait(mCancelSem)==-1)
+bool CAmWorker::timedWait(timespec timer)
+{
+    timespec temp;
+    if(clock_gettime(0, &temp)==-1)
+    {
+        logError("Worker::timedWait error on getting time");
+    }
+    temp.tv_nsec+=timer.tv_nsec;
+    temp.tv_sec+=timer.tv_sec;
+    //if(sem_wait(mCancelSem)==-1)
         if (sem_timedwait(mCancelSem,&temp)==-1)
         {
             //a timeout happened
-            if(errno == ETIMEDOUT)
-            {
-                logInfo("Worker::timedWait timed out - no bug !");
-                return (false);
-            }
-            else //failure in waiting, nevertheless, we quit the thread...
-            {
-                logError("Worker::timedWait semaphore waiting error");
-                return (true);
-            }
+        if(errno == ETIMEDOUT)
+        {
+            logInfo("Worker::timedWait timed out - no bug !");
+            return (false);
+        }
+        else //failure in waiting, nevertheless, we quit the thread...
+        {
+            logError("Worker::timedWait semaphore waiting error");
+            return (true);
         }
-        logError("Worker::timedWait semaphore waiting error");
-        this->cancelWork();
-        return (true);
     }
+    logError("Worker::timedWait semaphore waiting error");
+    this->cancelWork();
+    return (true);
+}
 
-    AsyncRoutingSender::AsyncRoutingSender():
-    mReceiveInterface(0), mDomains(createDomainTable()), mSinks(createSinkTable()), mSources ( createSourceTable ( ) ), mGateways ( createGatewayTable ( ) ), mMapHandleWorker ( ) , mMapConnectionIDRoute ( ) , mPool (10)
+CAmRoutingSenderAsync::CAmRoutingSenderAsync():
+mReceiveInterface(0), mDomains(createDomainTable()), mSinks(createSinkTable()), mSources ( createSourceTable ( ) ), mGateways ( createGatewayTable ( ) ), mMapHandleWorker ( ) , mMapConnectionIDRoute ( ) , mPool (10)
 {
 }
 
-AsyncRoutingSender::~AsyncRoutingSender()
+CAmRoutingSenderAsync::~CAmRoutingSenderAsync()
 {
     delete mShadow;
 }
 
-am_Error_e AsyncRoutingSender::startupInterface(RoutingReceiveInterface *routingreceiveinterface)
+am_Error_e CAmRoutingSenderAsync::startupInterface(IAmRoutingReceive *routingreceiveinterface)
 {
     //first, create the Shadow:
     assert(routingreceiveinterface!=0);
     mReceiveInterface = routingreceiveinterface;
-    SocketHandler* handler;
+    CAmSocketHandler* handler;
     routingreceiveinterface->getSocketHandler(handler);
-    mShadow = new RoutingReceiverAsyncShadow(routingreceiveinterface, handler);
+    mShadow = new IAmRoutingReceiverShadow(routingreceiveinterface, handler);
     return E_OK;
 }
 
-void AsyncRoutingSender::setRoutingReady(const uint16_t handle)
+void CAmRoutingSenderAsync::setRoutingReady(const uint16_t handle)
 {
     syncRegisterWorker *worker = new syncRegisterWorker(this, &mPool, mShadow, mDomains, mSinks, mSources, handle);
 
@@ -311,12 +233,13 @@ void AsyncRoutingSender::setRoutingReady(const uint16_t handle)
     //pthread_create(&mInterruptThread,NULL,&AsyncRoutingSender::InterruptEvents,&mShadow);
 }
 
-void AsyncRoutingSender::setRoutingRundown(const uint16_t handle)
+void CAmRoutingSenderAsync::setRoutingRundown(const uint16_t handle)
 {
     assert(mReceiveInterface!=0);
+    mShadow->confirmRoutingRundown(handle);
 }
 
-am_Error_e AsyncRoutingSender::asyncAbort(const am_Handle_s handle)
+am_Error_e CAmRoutingSenderAsync::asyncAbort(const am_Handle_s handle)
 {
     assert(mReceiveInterface!=0);
     assert(handle.handle!=0);
@@ -337,7 +260,7 @@ am_Error_e AsyncRoutingSender::asyncAbort(const am_Handle_s handle)
     return (E_UNKNOWN);
 }
 
-am_Error_e AsyncRoutingSender::asyncConnect(const am_Handle_s handle, const am_connectionID_t connectionID, const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_ConnectionFormat_e connectionFormat)
+am_Error_e CAmRoutingSenderAsync::asyncConnect(const am_Handle_s handle, const am_connectionID_t connectionID, const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_ConnectionFormat_e connectionFormat)
 {
     assert(mReceiveInterface!=0);
     assert(handle.handle!=0);
@@ -400,7 +323,7 @@ am_Error_e AsyncRoutingSender::asyncConnect(const am_Handle_s handle, const am_c
     return (E_OK);
 }
 
-am_Error_e AsyncRoutingSender::asyncDisconnect(const am_Handle_s handle, const am_connectionID_t connectionID)
+am_Error_e CAmRoutingSenderAsync::asyncDisconnect(const am_Handle_s handle, const am_connectionID_t connectionID)
 {
     assert(mReceiveInterface!=0);
     assert(handle.handle!=0);
@@ -435,7 +358,7 @@ am_Error_e AsyncRoutingSender::asyncDisconnect(const am_Handle_s handle, const a
     return (E_OK);
 }
 
-am_Error_e AsyncRoutingSender::asyncSetSinkVolume(const am_Handle_s handle, const am_sinkID_t sinkID, const am_volume_t volume, const am_RampType_e ramp, const am_time_t time)
+am_Error_e CAmRoutingSenderAsync::asyncSetSinkVolume(const am_Handle_s handle, const am_sinkID_t sinkID, const am_volume_t volume, const am_RampType_e ramp, const am_time_t time)
 {
     assert(mReceiveInterface!=0);
     assert(handle.handle!=0);
@@ -477,7 +400,7 @@ am_Error_e AsyncRoutingSender::asyncSetSinkVolume(const am_Handle_s handle, cons
     return (E_OK);
 }
 
-am_Error_e AsyncRoutingSender::asyncSetSourceVolume(const am_Handle_s handle, const am_sourceID_t sourceID, const am_volume_t volume, const am_RampType_e ramp, const am_time_t time)
+am_Error_e CAmRoutingSenderAsync::asyncSetSourceVolume(const am_Handle_s handle, const am_sourceID_t sourceID, const am_volume_t volume, const am_RampType_e ramp, const am_time_t time)
 {
     assert(mReceiveInterface!=0);
     assert(handle.handle!=0);
@@ -519,7 +442,7 @@ am_Error_e AsyncRoutingSender::asyncSetSourceVolume(const am_Handle_s handle, co
     return (E_OK);
 }
 
-am_Error_e AsyncRoutingSender::asyncSetSourceState(const am_Handle_s handle, const am_sourceID_t sourceID, const am_SourceState_e state)
+am_Error_e CAmRoutingSenderAsync::asyncSetSourceState(const am_Handle_s handle, const am_sourceID_t sourceID, const am_SourceState_e state)
 {
     assert(mReceiveInterface!=0);
     assert(handle.handle!=0);
@@ -561,7 +484,7 @@ am_Error_e AsyncRoutingSender::asyncSetSourceState(const am_Handle_s handle, con
     return (E_OK);
 }
 
-am_Error_e AsyncRoutingSender::asyncSetSinkSoundProperty(const am_Handle_s handle, const am_sinkID_t sinkID, const am_SoundProperty_s & soundProperty)
+am_Error_e CAmRoutingSenderAsync::asyncSetSinkSoundProperty(const am_Handle_s handle, const am_sinkID_t sinkID, const am_SoundProperty_s & soundProperty)
 {
     assert(mReceiveInterface!=0);
     assert(handle.handle!=0);
@@ -603,7 +526,7 @@ am_Error_e AsyncRoutingSender::asyncSetSinkSoundProperty(const am_Handle_s handl
     return (E_OK);
 }
 
-am_Error_e AsyncRoutingSender::asyncCrossFade(const am_Handle_s handle, const am_crossfaderID_t crossfaderID, const am_HotSink_e hotSink, const am_RampType_e rampType, const am_time_t time)
+am_Error_e CAmRoutingSenderAsync::asyncCrossFade(const am_Handle_s handle, const am_crossfaderID_t crossfaderID, const am_HotSink_e hotSink, const am_RampType_e rampType, const am_time_t time)
 {
     //todo: implement crossfader
     (void) handle;
@@ -614,7 +537,7 @@ am_Error_e AsyncRoutingSender::asyncCrossFade(const am_Handle_s handle, const am
     return E_NOT_USED;
 }
 
-am_Error_e AsyncRoutingSender::setDomainState(const am_domainID_t domainID, const am_DomainState_e domainState)
+am_Error_e CAmRoutingSenderAsync::setDomainState(const am_domainID_t domainID, const am_DomainState_e domainState)
 {
     assert(mReceiveInterface!=0);
     assert(domainID!=0);
@@ -650,7 +573,7 @@ am_Error_e AsyncRoutingSender::setDomainState(const am_domainID_t domainID, cons
 
 }
 
-am_Error_e AsyncRoutingSender::asyncSetSourceSoundProperty(const am_Handle_s handle, const am_sourceID_t sourceID, const am_SoundProperty_s & soundProperty)
+am_Error_e CAmRoutingSenderAsync::asyncSetSourceSoundProperty(const am_Handle_s handle, const am_sourceID_t sourceID, const am_SoundProperty_s & soundProperty)
 {
     assert(mReceiveInterface!=0);
     assert(handle.handle!=0);
@@ -692,13 +615,13 @@ am_Error_e AsyncRoutingSender::asyncSetSourceSoundProperty(const am_Handle_s han
     return (E_OK);
 }
 
-am_Error_e AsyncRoutingSender::returnBusName(std::string & BusName) const
+am_Error_e CAmRoutingSenderAsync::returnBusName(std::string & BusName) const
 {
     BusName = "RoutingAsync";
     return (E_OK);
 }
 
-std::vector<am_Domain_s> AsyncRoutingSender::createDomainTable()
+std::vector<am_Domain_s> CAmRoutingSenderAsync::createDomainTable()
 {
     //just write two domains into the table and return it
     std::vector<am_Domain_s> table;
@@ -720,7 +643,7 @@ std::vector<am_Domain_s> AsyncRoutingSender::createDomainTable()
     return (table);
 }
 
-std::vector<am_Sink_s> AsyncRoutingSender::createSinkTable()
+std::vector<am_Sink_s> CAmRoutingSenderAsync::createSinkTable()
 {
     //create a bunch full of sinks
     std::vector<am_Sink_s> table;
@@ -760,7 +683,7 @@ std::vector<am_Sink_s> AsyncRoutingSender::createSinkTable()
     return (table);
 }
 
-std::vector<am_Source_s> AsyncRoutingSender::createSourceTable()
+std::vector<am_Source_s> CAmRoutingSenderAsync::createSourceTable()
 {
     //create a bunch full of sources
     std::vector<am_Source_s> table;
@@ -784,14 +707,14 @@ std::vector<am_Source_s> AsyncRoutingSender::createSourceTable()
     return (table);
 }
 
-void AsyncRoutingSender::insertConnectionSafe(am_connectionID_t connectionID, am_RoutingElement_s route)
+void CAmRoutingSenderAsync::insertConnectionSafe(am_connectionID_t connectionID, am_RoutingElement_s route)
 {
     pthread_mutex_lock(&mMapConnectionMutex);
     mMapConnectionIDRoute.insert(std::make_pair(connectionID, route));
     pthread_mutex_unlock(&mMapConnectionMutex);
 }
 
-void AsyncRoutingSender::removeHandleSafe(uint16_t handle)
+void CAmRoutingSenderAsync::removeHandleSafe(uint16_t handle)
 {
     pthread_mutex_lock(&mMapHandleWorkerMutex);
     if (!mMapHandleWorker.erase(handle))
@@ -801,7 +724,7 @@ void AsyncRoutingSender::removeHandleSafe(uint16_t handle)
     pthread_mutex_unlock(&mMapHandleWorkerMutex);
 }
 
-void AsyncRoutingSender::removeConnectionSafe(am_connectionID_t connectionID)
+void CAmRoutingSenderAsync::removeConnectionSafe(am_connectionID_t connectionID)
 {
     pthread_mutex_lock(&mMapConnectionMutex);
     if (!mMapConnectionIDRoute.erase(connectionID))
@@ -811,7 +734,7 @@ void AsyncRoutingSender::removeConnectionSafe(am_connectionID_t connectionID)
     pthread_mutex_unlock(&mMapConnectionMutex);
 }
 
-void AsyncRoutingSender::updateSinkVolumeSafe(am_sinkID_t sinkID, am_volume_t volume)
+void CAmRoutingSenderAsync::updateSinkVolumeSafe(am_sinkID_t sinkID, am_volume_t volume)
 {
     pthread_mutex_lock(&mSinksMutex);
     std::vector<am_Sink_s>::iterator sinkIter = mSinks.begin();
@@ -826,7 +749,7 @@ void AsyncRoutingSender::updateSinkVolumeSafe(am_sinkID_t sinkID, am_volume_t vo
     pthread_mutex_unlock(&mSinksMutex);
 }
 
-void am::AsyncRoutingSender::updateSourceVolumeSafe(am_sourceID_t sourceID, am_volume_t volume)
+void am::CAmRoutingSenderAsync::updateSourceVolumeSafe(am_sourceID_t sourceID, am_volume_t volume)
 {
     pthread_mutex_lock(&mSourcesMutex);
     std::vector<am_Source_s>::iterator sourceIter = mSources.begin();
@@ -841,7 +764,7 @@ void am::AsyncRoutingSender::updateSourceVolumeSafe(am_sourceID_t sourceID, am_v
     pthread_mutex_unlock(&mSourcesMutex);
 }
 
-void am::AsyncRoutingSender::updateSourceStateSafe(am_sourceID_t sourceID, am_SourceState_e state)
+void am::CAmRoutingSenderAsync::updateSourceStateSafe(am_sourceID_t sourceID, am_SourceState_e state)
 {
     pthread_mutex_lock(&mSourcesMutex);
     std::vector<am_Source_s>::iterator sourceIter = mSources.begin();
@@ -856,7 +779,7 @@ void am::AsyncRoutingSender::updateSourceStateSafe(am_sourceID_t sourceID, am_So
     pthread_mutex_unlock(&mSourcesMutex);
 }
 
-void am::AsyncRoutingSender::updateSinkSoundPropertySafe(am_sinkID_t sinkID, am_SoundProperty_s soundProperty)
+void am::CAmRoutingSenderAsync::updateSinkSoundPropertySafe(am_sinkID_t sinkID, am_SoundProperty_s soundProperty)
 {
     pthread_mutex_lock(&mSinksMutex);
     std::vector<am_Sink_s>::iterator sinkIter = mSinks.begin();
@@ -878,7 +801,7 @@ void am::AsyncRoutingSender::updateSinkSoundPropertySafe(am_sinkID_t sinkID, am_
     pthread_mutex_unlock(&mSinksMutex);
 }
 
-void am::AsyncRoutingSender::updateSourceSoundPropertySafe(am_sourceID_t sourceID, am_SoundProperty_s soundProperty)
+void am::CAmRoutingSenderAsync::updateSourceSoundPropertySafe(am_sourceID_t sourceID, am_SoundProperty_s soundProperty)
 {
     pthread_mutex_lock(&mSourcesMutex);
     std::vector<am_Source_s>::iterator sourceIter = mSources.begin();
@@ -900,7 +823,7 @@ void am::AsyncRoutingSender::updateSourceSoundPropertySafe(am_sourceID_t sourceI
     pthread_mutex_unlock(&mSourcesMutex);
 }
 
-void am::AsyncRoutingSender::updateDomainstateSafe(am_domainID_t domainID, am_DomainState_e domainState)
+void am::CAmRoutingSenderAsync::updateDomainstateSafe(am_domainID_t domainID, am_DomainState_e domainState)
 {
     pthread_mutex_lock(&mDomainsMutex);
     std::vector<am_Domain_s>::iterator domainIter = mDomains.begin();
@@ -915,33 +838,33 @@ void am::AsyncRoutingSender::updateDomainstateSafe(am_domainID_t domainID, am_Do
     pthread_mutex_unlock(&mDomainsMutex);
 }
 
-void am::AsyncRoutingSender::updateDomainListSafe(std::vector<am_Domain_s> listDomains)
+void am::CAmRoutingSenderAsync::updateDomainListSafe(std::vector<am_Domain_s> listDomains)
 {
     pthread_mutex_lock(&mDomainsMutex);
     mDomains = listDomains;
     pthread_mutex_unlock(&mDomainsMutex);
 }
 
-void am::AsyncRoutingSender::updateSourceListSafe(std::vector<am_Source_s> listSource)
+void am::CAmRoutingSenderAsync::updateSourceListSafe(std::vector<am_Source_s> listSource)
 {
     pthread_mutex_lock(&mSourcesMutex);
     mSources = listSource;
     pthread_mutex_unlock(&mSourcesMutex);
 }
 
-void am::AsyncRoutingSender::updateSinkListSafe(std::vector<am_Sink_s> listSinks)
+void am::CAmRoutingSenderAsync::updateSinkListSafe(std::vector<am_Sink_s> listSinks)
 {
     pthread_mutex_lock(&mSinksMutex);
     mSinks = listSinks;
     pthread_mutex_unlock(&mSinksMutex);
 }
 
-void AsyncRoutingSender::getInterfaceVersion(std::string & version) const
+void CAmRoutingSenderAsync::getInterfaceVersion(std::string & version) const
 {
     version = RoutingSendVersion;
 }
 
-am_Error_e AsyncRoutingSender::asyncSetSourceSoundProperties(const am_Handle_s handle, const am_sourceID_t sourceID, const std::vector<am_SoundProperty_s> & listSoundProperties)
+am_Error_e CAmRoutingSenderAsync::asyncSetSourceSoundProperties(const am_Handle_s handle, const am_sourceID_t sourceID, const std::vector<am_SoundProperty_s> & listSoundProperties)
 {
     //todo: implement
     (void) handle;
@@ -950,7 +873,7 @@ am_Error_e AsyncRoutingSender::asyncSetSourceSoundProperties(const am_Handle_s h
     return (E_NOT_USED);
 }
 
-am_Error_e AsyncRoutingSender::asyncSetSinkSoundProperties(const am_Handle_s handle, const am_sinkID_t sinkID, const std::vector<am_SoundProperty_s> & listSoundProperties)
+am_Error_e CAmRoutingSenderAsync::asyncSetSinkSoundProperties(const am_Handle_s handle, const am_sinkID_t sinkID, const std::vector<am_SoundProperty_s> & listSoundProperties)
 {
     //todo: implement
     (void) handle;
@@ -959,7 +882,7 @@ am_Error_e AsyncRoutingSender::asyncSetSinkSoundProperties(const am_Handle_s han
     return (E_NOT_USED);
 }
 
-std::vector<am_Gateway_s> AsyncRoutingSender::createGatewayTable()
+std::vector<am_Gateway_s> CAmRoutingSenderAsync::createGatewayTable()
 {
     std::vector<am_Gateway_s> table;
     am_Gateway_s item;
@@ -970,8 +893,8 @@ std::vector<am_Gateway_s> AsyncRoutingSender::createGatewayTable()
     return (table);
 }
 
-asycConnectWorker::asycConnectWorker(AsyncRoutingSender * asyncSender, WorkerThreadPool *pool, RoutingReceiverAsyncShadow* shadow, const am_Handle_s handle, const am_connectionID_t connectionID, const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_ConnectionFormat_e connectionFormat) :
-        Worker(pool), //
+asycConnectWorker::asycConnectWorker(CAmRoutingSenderAsync * asyncSender, CAmWorkerThreadPool *pool, IAmRoutingReceiverShadow* shadow, const am_Handle_s handle, const am_connectionID_t connectionID, const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_ConnectionFormat_e connectionFormat) :
+        CAmWorker(pool), //
         mAsyncSender(asyncSender), //
         mShadow(shadow), //
         mHandle(handle), //
@@ -1013,8 +936,8 @@ void asycConnectWorker::cancelWork()
     mShadow->ackConnect(mHandle, mConnectionID, E_ABORTED);
 }
 
-asycDisConnectWorker::asycDisConnectWorker(AsyncRoutingSender *asyncSender, WorkerThreadPool *pool, RoutingReceiverAsyncShadow *shadow, const am_Handle_s handle, const am_connectionID_t connectionID) :
-        Worker(pool), //
+asycDisConnectWorker::asycDisConnectWorker(CAmRoutingSenderAsync *asyncSender, CAmWorkerThreadPool *pool, IAmRoutingReceiverShadow *shadow, const am_Handle_s handle, const am_connectionID_t connectionID) :
+        CAmWorker(pool), //
         mAsyncSender(asyncSender), //
         mShadow(shadow), //
         mHandle(handle), //
@@ -1051,8 +974,8 @@ void asycDisConnectWorker::cancelWork()
     mShadow->ackDisconnect(mHandle, mConnectionID, E_ABORTED);
 }
 
-asyncSetSinkVolumeWorker::asyncSetSinkVolumeWorker(AsyncRoutingSender *asyncSender, WorkerThreadPool *pool, RoutingReceiverAsyncShadow *shadow, const am_volume_t currentVolume, const am_Handle_s handle, const am_sinkID_t sinkID, const am_volume_t volume, const am_RampType_e ramp, const am_time_t time) :
-        Worker(pool), //
+asyncSetSinkVolumeWorker::asyncSetSinkVolumeWorker(CAmRoutingSenderAsync *asyncSender, CAmWorkerThreadPool *pool, IAmRoutingReceiverShadow *shadow, const am_volume_t currentVolume, const am_Handle_s handle, const am_sinkID_t sinkID, const am_volume_t volume, const am_RampType_e ramp, const am_time_t time) :
+        CAmWorker(pool), //
         mAsyncSender(asyncSender), //
         mShadow(shadow), //
         mCurrentVolume(currentVolume), //
@@ -1100,8 +1023,8 @@ void asyncSetSinkVolumeWorker::cancelWork()
     mShadow->ackSetSinkVolumeChange(mHandle, mCurrentVolume, E_ABORTED);
 }
 
-asyncSetSourceVolumeWorker::asyncSetSourceVolumeWorker(AsyncRoutingSender *asyncSender, WorkerThreadPool *pool, RoutingReceiverAsyncShadow *shadow, const am_volume_t currentVolume, const am_Handle_s handle, const am_sourceID_t SourceID, const am_volume_t volume, const am_RampType_e ramp, const am_time_t time) :
-        Worker(pool), //
+asyncSetSourceVolumeWorker::asyncSetSourceVolumeWorker(CAmRoutingSenderAsync *asyncSender, CAmWorkerThreadPool *pool, IAmRoutingReceiverShadow *shadow, const am_volume_t currentVolume, const am_Handle_s handle, const am_sourceID_t SourceID, const am_volume_t volume, const am_RampType_e ramp, const am_time_t time) :
+        CAmWorker(pool), //
         mAsyncSender(asyncSender), //
         mShadow(shadow), //
         mCurrentVolume(currentVolume), //
@@ -1149,8 +1072,8 @@ void asyncSetSourceVolumeWorker::cancelWork()
     mShadow->ackSetSourceVolumeChange(mHandle, mCurrentVolume, E_ABORTED);
 }
 
-asyncSetSourceStateWorker::asyncSetSourceStateWorker(AsyncRoutingSender *asyncSender, WorkerThreadPool *pool, RoutingReceiverAsyncShadow *shadow, const am_Handle_s handle, const am_sourceID_t sourceID, const am_SourceState_e state) :
-        Worker(pool), //
+asyncSetSourceStateWorker::asyncSetSourceStateWorker(CAmRoutingSenderAsync *asyncSender, CAmWorkerThreadPool *pool, IAmRoutingReceiverShadow *shadow, const am_Handle_s handle, const am_sourceID_t sourceID, const am_SourceState_e state) :
+        CAmWorker(pool), //
         mAsyncSender(asyncSender), //
         mShadow(shadow), //
         mHandle(handle), //
@@ -1189,8 +1112,8 @@ void asyncSetSourceStateWorker::cancelWork()
     mAsyncSender->removeHandleSafe(mHandle.handle);
 }
 
-asyncSetSinkSoundPropertyWorker::asyncSetSinkSoundPropertyWorker(AsyncRoutingSender *asyncSender, WorkerThreadPool *pool, RoutingReceiverAsyncShadow *shadow, const am_Handle_s handle, const am_SoundProperty_s soundProperty, const am_sinkID_t sinkID) :
-        Worker(pool), //
+asyncSetSinkSoundPropertyWorker::asyncSetSinkSoundPropertyWorker(CAmRoutingSenderAsync *asyncSender, CAmWorkerThreadPool *pool, IAmRoutingReceiverShadow *shadow, const am_Handle_s handle, const am_SoundProperty_s soundProperty, const am_sinkID_t sinkID) :
+        CAmWorker(pool), //
         mAsyncSender(asyncSender), //
         mShadow(shadow), //
         mHandle(handle), //
@@ -1229,8 +1152,8 @@ void asyncSetSinkSoundPropertyWorker::cancelWork()
     mAsyncSender->removeHandleSafe(mHandle.handle);
 }
 
-asyncSetSourceSoundPropertyWorker::asyncSetSourceSoundPropertyWorker(AsyncRoutingSender *asyncSender, WorkerThreadPool *pool, RoutingReceiverAsyncShadow *shadow, const am_Handle_s handle, const am_SoundProperty_s soundProperty, const am_sourceID_t sourceID) :
-        Worker(pool), //
+asyncSetSourceSoundPropertyWorker::asyncSetSourceSoundPropertyWorker(CAmRoutingSenderAsync *asyncSender, CAmWorkerThreadPool *pool, IAmRoutingReceiverShadow *shadow, const am_Handle_s handle, const am_SoundProperty_s soundProperty, const am_sourceID_t sourceID) :
+        CAmWorker(pool), //
         mAsyncSender(asyncSender), //
         mShadow(shadow), //
         mHandle(handle), //
@@ -1269,8 +1192,8 @@ void asyncSetSourceSoundPropertyWorker::cancelWork()
     mAsyncSender->removeHandleSafe(mHandle.handle);
 }
 
-asyncDomainStateChangeWorker::asyncDomainStateChangeWorker(AsyncRoutingSender *asyncSender, WorkerThreadPool *pool, RoutingReceiverAsyncShadow *shadow, const am_domainID_t domainID, const am_DomainState_e domainState) :
-        Worker(pool), //
+asyncDomainStateChangeWorker::asyncDomainStateChangeWorker(CAmRoutingSenderAsync *asyncSender, CAmWorkerThreadPool *pool, IAmRoutingReceiverShadow *shadow, const am_domainID_t domainID, const am_DomainState_e domainState) :
+        CAmWorker(pool), //
         mAsyncSender(asyncSender), //
         mShadow(shadow), //
         mDomainID(domainID), //
@@ -1303,14 +1226,13 @@ void am::asyncDomainStateChangeWorker::cancelWork()
     mShadow->hookDomainStateChange(mDomainID, mDomainState);
 }
 
-syncRegisterWorker::syncRegisterWorker(AsyncRoutingSender * asyncSender, WorkerThreadPool* pool, RoutingReceiverAsyncShadow* shadow, const std::vector<am_Domain_s> domains, const std::vector<am_Sink_s> sinks, const std::vector<am_Source_s> sources, const  uint16_t handle) :
-        Worker(pool), //
+syncRegisterWorker::syncRegisterWorker(CAmRoutingSenderAsync * asyncSender, CAmWorkerThreadPool* pool, IAmRoutingReceiverShadow* shadow, const std::vector<am_Domain_s> domains, const std::vector<am_Sink_s> sinks, const std::vector<am_Source_s> sources, const uint16_t handle) :
+        CAmWorker(pool), //
         mAsyncSender(asyncSender), //
         mShadow(shadow), //
         mListDomains(domains), //
         mListSinks(sinks), //
-        mListSources(sources),
-        mHandle(handle)
+        mListSources(sources), mHandle(handle)
 {
 }
 
diff --git a/PluginRoutingInterfaceAsync/src/IAmRoutingReceiverShadow.cpp b/PluginRoutingInterfaceAsync/src/IAmRoutingReceiverShadow.cpp
new file mode 100644
index 0000000..b8733db
--- /dev/null
+++ b/PluginRoutingInterfaceAsync/src/IAmRoutingReceiverShadow.cpp
@@ -0,0 +1,195 @@
+/**
+ * Copyright (C) 2011, BMW AG
+ *
+ * GeniviAudioMananger AudioManagerDaemon
+ *
+ * \file RoutingReceiverAsyncShadow.cpp
+ *
+ * \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.
+ *
+ */
+
+#include "IAmRoutingReceiverShadow.h"
+#include <cassert>
+#include <sys/socket.h>
+#include <sys/ioctl.h>
+#include <string.h>
+#include <netdb.h>
+#include <fcntl.h>
+#include <sys/un.h>
+#include <errno.h>
+#include <string>
+#include "shared/CAmDltWrapper.h"
+
+using namespace am;
+
+IAmRoutingReceiverShadow::IAmRoutingReceiverShadow(IAmRoutingReceive* iReceiveInterface, CAmSocketHandler* iSocketHandler) :
+        mSocketHandler(iSocketHandler), //
+        mRoutingReceiveInterface(iReceiveInterface), //
+        mSerializer(iSocketHandler)
+{
+
+}
+
+IAmRoutingReceiverShadow::~IAmRoutingReceiverShadow()
+{
+}
+
+void IAmRoutingReceiverShadow::ackConnect(const am_Handle_s handle, const am_connectionID_t connectionID, const am_Error_e error)
+{
+    mSerializer.asyncCall<IAmRoutingReceive, const am_Handle_s, const am_connectionID_t, const am_Error_e>(mRoutingReceiveInterface, &IAmRoutingReceive::ackConnect, handle, connectionID, error);
+}
+
+void IAmRoutingReceiverShadow::ackDisconnect(const am_Handle_s handle, const am_connectionID_t connectionID, const am_Error_e error)
+{
+    mSerializer.asyncCall<IAmRoutingReceive, const am_Handle_s, const am_connectionID_t, const am_Error_e>(mRoutingReceiveInterface, &IAmRoutingReceive::ackDisconnect, handle, connectionID, error);
+}
+
+void IAmRoutingReceiverShadow::ackSetSinkVolumeChange(const am_Handle_s handle, const am_volume_t volume, const am_Error_e error)
+{
+    mSerializer.asyncCall<IAmRoutingReceive, const am_Handle_s, const am_volume_t, const am_Error_e>(mRoutingReceiveInterface, &IAmRoutingReceive::ackSetSinkVolumeChange, handle, volume, error);
+}
+
+void IAmRoutingReceiverShadow::ackSetSourceVolumeChange(const am_Handle_s handle, const am_volume_t volume, const am_Error_e error)
+{
+    mSerializer.asyncCall<IAmRoutingReceive, const am_Handle_s, const am_volume_t, const am_Error_e>(mRoutingReceiveInterface, &IAmRoutingReceive::ackSetSourceVolumeChange, handle, volume, error);
+}
+
+void IAmRoutingReceiverShadow::ackSetSourceState(const am_Handle_s handle, const am_Error_e error)
+{
+    mSerializer.asyncCall<IAmRoutingReceive, const am_Handle_s, const am_Error_e>(mRoutingReceiveInterface, &IAmRoutingReceive::ackSetSourceState, handle, error);
+}
+
+void IAmRoutingReceiverShadow::ackSetSinkSoundProperty(const am_Handle_s handle, const am_Error_e error)
+{
+    mSerializer.asyncCall<IAmRoutingReceive, const am_Handle_s, const am_Error_e>(mRoutingReceiveInterface, &IAmRoutingReceive::ackSetSinkSoundProperty, handle, error);
+}
+
+void IAmRoutingReceiverShadow::ackSetSourceSoundProperty(const am_Handle_s handle, const am_Error_e error)
+{
+    mSerializer.asyncCall<IAmRoutingReceive, const am_Handle_s, const am_Error_e>(mRoutingReceiveInterface, &IAmRoutingReceive::ackSetSourceSoundProperty, handle, error);
+}
+
+void IAmRoutingReceiverShadow::ackCrossFading(const am_Handle_s handle, const am_HotSink_e hotSink, const am_Error_e error)
+{
+    mSerializer.asyncCall<IAmRoutingReceive, const am_Handle_s, const am_HotSink_e, const am_Error_e>(mRoutingReceiveInterface, &IAmRoutingReceive::ackCrossFading, handle, hotSink, error);
+}
+
+void IAmRoutingReceiverShadow::ackSourceVolumeTick(const am_Handle_s handle, const am_sourceID_t sourceID, const am_volume_t volume)
+{
+    mSerializer.asyncCall<IAmRoutingReceive, const am_Handle_s, const am_sourceID_t, const am_volume_t>(mRoutingReceiveInterface, &IAmRoutingReceive::ackSourceVolumeTick, handle, sourceID, volume);
+}
+
+void IAmRoutingReceiverShadow::ackSinkVolumeTick(const am_Handle_s handle, const am_sinkID_t sinkID, const am_volume_t volume)
+{
+    mSerializer.asyncCall<IAmRoutingReceive, const am_Handle_s, const am_sinkID_t, const am_volume_t>(mRoutingReceiveInterface, &IAmRoutingReceive::ackSinkVolumeTick, handle, sinkID, volume);
+}
+
+void IAmRoutingReceiverShadow::hookInterruptStatusChange(const am_sourceID_t sourceID, const am_InterruptState_e interruptState)
+{
+    mSerializer.asyncCall<IAmRoutingReceive, const am_sinkID_t, const am_InterruptState_e>(mRoutingReceiveInterface, &IAmRoutingReceive::hookInterruptStatusChange, sourceID, interruptState);
+}
+
+void IAmRoutingReceiverShadow::hookSinkAvailablityStatusChange(const am_sinkID_t sinkID, const am_Availability_s & availability)
+{
+    mSerializer.asyncCall<IAmRoutingReceive, const am_sinkID_t, const am_Availability_s&>(mRoutingReceiveInterface, &IAmRoutingReceive::hookSinkAvailablityStatusChange, sinkID, availability);
+}
+
+void IAmRoutingReceiverShadow::hookSourceAvailablityStatusChange(const am_sourceID_t sourceID, const am_Availability_s & availability)
+{
+    mSerializer.asyncCall<IAmRoutingReceive, const am_sourceID_t, const am_Availability_s&>(mRoutingReceiveInterface, &IAmRoutingReceive::hookSourceAvailablityStatusChange, sourceID, availability);
+}
+
+void IAmRoutingReceiverShadow::hookDomainStateChange(const am_domainID_t domainID, const am_DomainState_e domainState)
+{
+    mSerializer.asyncCall<IAmRoutingReceive, const am_domainID_t, const am_DomainState_e>(mRoutingReceiveInterface, &IAmRoutingReceive::hookDomainStateChange, domainID, domainState);
+}
+
+void IAmRoutingReceiverShadow::hookTimingInformationChanged(const am_connectionID_t connectionID, const am_timeSync_t delay)
+{
+    mSerializer.asyncCall<IAmRoutingReceive, const am_connectionID_t, const am_timeSync_t>(mRoutingReceiveInterface, &IAmRoutingReceive::hookTimingInformationChanged, connectionID, delay);
+}
+
+am_Error_e IAmRoutingReceiverShadow::registerDomain(const am_Domain_s & domainData, am_domainID_t & domainID)
+{
+    am_Error_e error (E_UNKNOWN);
+    am_Domain_s domainDataCopy(domainData);
+    mSerializer.syncCall<IAmRoutingReceive, am_Error_e, const am_Domain_s&,am_domainID_t&, am_Domain_s, am_domainID_t>(mRoutingReceiveInterface, &IAmRoutingReceive::registerDomain, error, domainDataCopy, domainID);
+    return (error);
+}
+
+am_Error_e am::IAmRoutingReceiverShadow::registerGateway(const am_Gateway_s & gatewayData, am_gatewayID_t & gatewayID)
+{
+    am_Error_e error (E_UNKNOWN);
+    am_Gateway_s gatewayDataCopy(gatewayData);
+    mSerializer.syncCall<IAmRoutingReceive, am_Error_e, const am_Gateway_s&, am_gatewayID_t&, am_Gateway_s, am_gatewayID_t>(mRoutingReceiveInterface,&IAmRoutingReceive::registerGateway, error, gatewayDataCopy, gatewayID);
+    return (error);
+}
+
+am_Error_e am::IAmRoutingReceiverShadow::registerSink(const am_Sink_s & sinkData, am_sinkID_t & sinkID)
+{
+    am_Error_e error (E_UNKNOWN);
+    am_Sink_s sinkDataCopy(sinkData);
+    mSerializer.syncCall<IAmRoutingReceive, am_Error_e, const am_Sink_s&, am_sinkID_t&, am_Sink_s, am_sinkID_t>(mRoutingReceiveInterface,&IAmRoutingReceive::registerSink, error, sinkDataCopy, sinkID);
+    return (error);
+}
+
+am_Error_e am::IAmRoutingReceiverShadow::deregisterSink(const am_sinkID_t sinkID)
+{
+    am_Error_e error;
+    am_sinkID_t s(sinkID); //no const values allowed in syncCalls due to reference !
+    mSerializer.syncCall<IAmRoutingReceive, am_Error_e, am_sinkID_t>(mRoutingReceiveInterface, &IAmRoutingReceive::deregisterSink, error, s);
+    return (error);
+}
+
+am_Error_e am::IAmRoutingReceiverShadow::registerSource(const am_Source_s & sourceData, am_sourceID_t & sourceID)
+{
+    am_Error_e error (E_UNKNOWN);
+    am_Source_s sourceDataCopy(sourceData);
+    mSerializer.syncCall<IAmRoutingReceive, am_Error_e, const am_Source_s&, am_sourceID_t&, am_Source_s, am_sourceID_t>(mRoutingReceiveInterface,&IAmRoutingReceive::registerSource, error, sourceDataCopy, sourceID);
+    return (error);
+}
+
+am_Error_e am::IAmRoutingReceiverShadow::deregisterSource(const am_sourceID_t sourceID)
+{
+    am_Error_e error;
+    am_sourceID_t s(sourceID); //no const values allowed in syncCalls due to reference !
+    mSerializer.syncCall<IAmRoutingReceive, am_Error_e, am_sinkID_t>(mRoutingReceiveInterface, &IAmRoutingReceive::deregisterSource, error, s);
+    return (error);
+}
+
+am_Error_e am::IAmRoutingReceiverShadow::registerCrossfader(const am_Crossfader_s & crossfaderData, am_crossfaderID_t & crossfaderID)
+{
+    am_Error_e error (E_UNKNOWN);
+    am_Crossfader_s crossfaderDataCopy(crossfaderData);
+    mSerializer.syncCall<IAmRoutingReceive, am_Error_e, const am_Crossfader_s&, am_crossfaderID_t&, am_Crossfader_s, am_crossfaderID_t>(mRoutingReceiveInterface,&IAmRoutingReceive::registerCrossfader, error, crossfaderDataCopy, crossfaderID);
+    return (error);
+}
+
+void am::IAmRoutingReceiverShadow::confirmRoutingReady(uint16_t starupHandle)
+{
+    mSerializer.asyncCall<IAmRoutingReceive,uint16_t>(mRoutingReceiveInterface,&IAmRoutingReceive::confirmRoutingReady,starupHandle);
+}
+
+void am::IAmRoutingReceiverShadow::confirmRoutingRundown(uint16_t rundownHandle)
+{
+    mSerializer.asyncCall<IAmRoutingReceive,uint16_t>(mRoutingReceiveInterface,&IAmRoutingReceive::confirmRoutingRundown,rundownHandle);
+}
+
+
+
+
+
diff --git a/PluginRoutingInterfaceAsync/src/RoutingReceiverAsyncShadow.cpp b/PluginRoutingInterfaceAsync/src/RoutingReceiverAsyncShadow.cpp
deleted file mode 100644
index 5c93f60..0000000
--- a/PluginRoutingInterfaceAsync/src/RoutingReceiverAsyncShadow.cpp
+++ /dev/null
@@ -1,188 +0,0 @@
-/**
- * Copyright (C) 2011, BMW AG
- *
- * GeniviAudioMananger AudioManagerDaemon
- *
- * \file RoutingReceiverAsyncShadow.cpp
- *
- * \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.
- *
- */
-
-#include "RoutingReceiverAsyncShadow.h"
-#include <cassert>
-#include <sys/socket.h>
-#include <sys/ioctl.h>
-#include <string.h>
-#include <netdb.h>
-#include <fcntl.h>
-#include <sys/un.h>
-#include <errno.h>
-#include <string>
-#include "DLTWrapper.h"
-
-using namespace am;
-
-RoutingReceiverAsyncShadow::RoutingReceiverAsyncShadow(RoutingReceiveInterface* iReceiveInterface, SocketHandler* iSocketHandler) :
-        mSocketHandler(iSocketHandler), //
-        mRoutingReceiveInterface(iReceiveInterface), //
-        mSerializer(iSocketHandler)
-{
-
-}
-
-RoutingReceiverAsyncShadow::~RoutingReceiverAsyncShadow()
-{
-}
-
-void RoutingReceiverAsyncShadow::ackConnect(const am_Handle_s handle, const am_connectionID_t connectionID, const am_Error_e error)
-{
-    mSerializer.asyncCall<RoutingReceiveInterface, const am_Handle_s, const am_connectionID_t, const am_Error_e>(mRoutingReceiveInterface, &RoutingReceiveInterface::ackConnect, handle, connectionID, error);
-}
-
-void RoutingReceiverAsyncShadow::ackDisconnect(const am_Handle_s handle, const am_connectionID_t connectionID, const am_Error_e error)
-{
-    mSerializer.asyncCall<RoutingReceiveInterface, const am_Handle_s, const am_connectionID_t, const am_Error_e>(mRoutingReceiveInterface, &RoutingReceiveInterface::ackDisconnect, handle, connectionID, error);
-}
-
-void RoutingReceiverAsyncShadow::ackSetSinkVolumeChange(const am_Handle_s handle, const am_volume_t volume, const am_Error_e error)
-{
-    mSerializer.asyncCall<RoutingReceiveInterface, const am_Handle_s, const am_volume_t, const am_Error_e>(mRoutingReceiveInterface, &RoutingReceiveInterface::ackSetSinkVolumeChange, handle, volume, error);
-}
-
-void RoutingReceiverAsyncShadow::ackSetSourceVolumeChange(const am_Handle_s handle, const am_volume_t volume, const am_Error_e error)
-{
-    mSerializer.asyncCall<RoutingReceiveInterface, const am_Handle_s, const am_volume_t, const am_Error_e>(mRoutingReceiveInterface, &RoutingReceiveInterface::ackSetSourceVolumeChange, handle, volume, error);
-}
-
-void RoutingReceiverAsyncShadow::ackSetSourceState(const am_Handle_s handle, const am_Error_e error)
-{
-    mSerializer.asyncCall<RoutingReceiveInterface, const am_Handle_s, const am_Error_e>(mRoutingReceiveInterface, &RoutingReceiveInterface::ackSetSourceState, handle, error);
-}
-
-void RoutingReceiverAsyncShadow::ackSetSinkSoundProperty(const am_Handle_s handle, const am_Error_e error)
-{
-    mSerializer.asyncCall<RoutingReceiveInterface, const am_Handle_s, const am_Error_e>(mRoutingReceiveInterface, &RoutingReceiveInterface::ackSetSinkSoundProperty, handle, error);
-}
-
-void RoutingReceiverAsyncShadow::ackSetSourceSoundProperty(const am_Handle_s handle, const am_Error_e error)
-{
-    mSerializer.asyncCall<RoutingReceiveInterface, const am_Handle_s, const am_Error_e>(mRoutingReceiveInterface, &RoutingReceiveInterface::ackSetSourceSoundProperty, handle, error);
-}
-
-void RoutingReceiverAsyncShadow::ackCrossFading(const am_Handle_s handle, const am_HotSink_e hotSink, const am_Error_e error)
-{
-    mSerializer.asyncCall<RoutingReceiveInterface, const am_Handle_s, const am_HotSink_e, const am_Error_e>(mRoutingReceiveInterface, &RoutingReceiveInterface::ackCrossFading, handle, hotSink, error);
-}
-
-void RoutingReceiverAsyncShadow::ackSourceVolumeTick(const am_Handle_s handle, const am_sourceID_t sourceID, const am_volume_t volume)
-{
-    mSerializer.asyncCall<RoutingReceiveInterface, const am_Handle_s, const am_sourceID_t, const am_volume_t>(mRoutingReceiveInterface, &RoutingReceiveInterface::ackSourceVolumeTick, handle, sourceID, volume);
-}
-
-void RoutingReceiverAsyncShadow::ackSinkVolumeTick(const am_Handle_s handle, const am_sinkID_t sinkID, const am_volume_t volume)
-{
-    mSerializer.asyncCall<RoutingReceiveInterface, const am_Handle_s, const am_sinkID_t, const am_volume_t>(mRoutingReceiveInterface, &RoutingReceiveInterface::ackSinkVolumeTick, handle, sinkID, volume);
-}
-
-void RoutingReceiverAsyncShadow::hookInterruptStatusChange(const am_sourceID_t sourceID, const am_InterruptState_e interruptState)
-{
-    mSerializer.asyncCall<RoutingReceiveInterface, const am_sinkID_t, const am_InterruptState_e>(mRoutingReceiveInterface, &RoutingReceiveInterface::hookInterruptStatusChange, sourceID, interruptState);
-}
-
-void RoutingReceiverAsyncShadow::hookSinkAvailablityStatusChange(const am_sinkID_t sinkID, const am_Availability_s & availability)
-{
-    mSerializer.asyncCall<RoutingReceiveInterface, const am_sinkID_t, const am_Availability_s&>(mRoutingReceiveInterface, &RoutingReceiveInterface::hookSinkAvailablityStatusChange, sinkID, availability);
-}
-
-void RoutingReceiverAsyncShadow::hookSourceAvailablityStatusChange(const am_sourceID_t sourceID, const am_Availability_s & availability)
-{
-    mSerializer.asyncCall<RoutingReceiveInterface, const am_sourceID_t, const am_Availability_s&>(mRoutingReceiveInterface, &RoutingReceiveInterface::hookSourceAvailablityStatusChange, sourceID, availability);
-}
-
-void RoutingReceiverAsyncShadow::hookDomainStateChange(const am_domainID_t domainID, const am_DomainState_e domainState)
-{
-    mSerializer.asyncCall<RoutingReceiveInterface, const am_domainID_t, const am_DomainState_e>(mRoutingReceiveInterface, &RoutingReceiveInterface::hookDomainStateChange, domainID, domainState);
-}
-
-void RoutingReceiverAsyncShadow::hookTimingInformationChanged(const am_connectionID_t connectionID, const am_timeSync_t delay)
-{
-    mSerializer.asyncCall<RoutingReceiveInterface, const am_connectionID_t, const am_timeSync_t>(mRoutingReceiveInterface, &RoutingReceiveInterface::hookTimingInformationChanged, connectionID, delay);
-}
-
-am_Error_e RoutingReceiverAsyncShadow::registerDomain(const am_Domain_s & domainData, am_domainID_t & domainID)
-{
-    am_Error_e error (E_UNKNOWN);
-    am_Domain_s domainDataCopy(domainData);
-    mSerializer.syncCall<RoutingReceiveInterface, am_Error_e, const am_Domain_s&,am_domainID_t&, am_Domain_s, am_domainID_t>(mRoutingReceiveInterface, &RoutingReceiveInterface::registerDomain, error, domainDataCopy, domainID);
-    return (error);
-}
-
-am_Error_e am::RoutingReceiverAsyncShadow::registerGateway(const am_Gateway_s & gatewayData, am_gatewayID_t & gatewayID)
-{
-    am_Error_e error (E_UNKNOWN);
-    am_Gateway_s gatewayDataCopy(gatewayData);
-    mSerializer.syncCall<RoutingReceiveInterface, am_Error_e, const am_Gateway_s&, am_gatewayID_t&, am_Gateway_s, am_gatewayID_t>(mRoutingReceiveInterface,&RoutingReceiveInterface::registerGateway, error, gatewayDataCopy, gatewayID);
-    return (error);
-}
-
-am_Error_e am::RoutingReceiverAsyncShadow::registerSink(const am_Sink_s & sinkData, am_sinkID_t & sinkID)
-{
-    am_Error_e error (E_UNKNOWN);
-    am_Sink_s sinkDataCopy(sinkData);
-    mSerializer.syncCall<RoutingReceiveInterface, am_Error_e, const am_Sink_s&, am_sinkID_t&, am_Sink_s, am_sinkID_t>(mRoutingReceiveInterface,&RoutingReceiveInterface::registerSink, error, sinkDataCopy, sinkID);
-    return (error);
-}
-
-am_Error_e am::RoutingReceiverAsyncShadow::deregisterSink(const am_sinkID_t sinkID)
-{
-    am_Error_e error;
-    am_sinkID_t s(sinkID); //no const values allowed in syncCalls due to reference !
-    mSerializer.syncCall<RoutingReceiveInterface, am_Error_e, am_sinkID_t>(mRoutingReceiveInterface, &RoutingReceiveInterface::deregisterSink, error, s);
-    return (error);
-}
-
-am_Error_e am::RoutingReceiverAsyncShadow::registerSource(const am_Source_s & sourceData, am_sourceID_t & sourceID)
-{
-    am_Error_e error (E_UNKNOWN);
-    am_Source_s sourceDataCopy(sourceData);
-    mSerializer.syncCall<RoutingReceiveInterface, am_Error_e, const am_Source_s&, am_sourceID_t&, am_Source_s, am_sourceID_t>(mRoutingReceiveInterface,&RoutingReceiveInterface::registerSource, error, sourceDataCopy, sourceID);
-    return (error);
-}
-
-am_Error_e am::RoutingReceiverAsyncShadow::deregisterSource(const am_sourceID_t sourceID)
-{
-    am_Error_e error;
-    am_sourceID_t s(sourceID); //no const values allowed in syncCalls due to reference !
-    mSerializer.syncCall<RoutingReceiveInterface, am_Error_e, am_sinkID_t>(mRoutingReceiveInterface, &RoutingReceiveInterface::deregisterSource, error, s);
-    return (error);
-}
-
-am_Error_e am::RoutingReceiverAsyncShadow::registerCrossfader(const am_Crossfader_s & crossfaderData, am_crossfaderID_t & crossfaderID)
-{
-    am_Error_e error (E_UNKNOWN);
-    am_Crossfader_s crossfaderDataCopy(crossfaderData);
-    mSerializer.syncCall<RoutingReceiveInterface, am_Error_e, const am_Crossfader_s&, am_crossfaderID_t&, am_Crossfader_s, am_crossfaderID_t>(mRoutingReceiveInterface,&RoutingReceiveInterface::registerCrossfader, error, crossfaderDataCopy, crossfaderID);
-    return (error);
-}
-
-void am::RoutingReceiverAsyncShadow::confirmRoutingReady(uint16_t starupHandle)
-{
-    mSerializer.asyncCall<RoutingReceiveInterface,uint16_t>(mRoutingReceiveInterface,&RoutingReceiveInterface::confirmRoutingReady,starupHandle);
-}
-
-
-