* [GAM-4] updated interfaces

* shifted mainpage doxygen from EA generated to mainpage.h
* added logo to doxygen documentation
* fixed compile bug in cmakelists when no plugins are build
* [ GAM-23 ]fixed plugin version recognition in cmake
* first working CAmSerializer with DatabaseObserver

11 files changed, 390 insertions, 336 deletions

diff --git a/AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp b/AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp
index 2066487..9e052cc 100644
--- a/AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp
+++ b/AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp
@@ -741,7 +741,13 @@ void CAmTelnetMenuHelper::getSenderversionCommandExec(std::queue<std::string> &
     (void) CmdQueue;
 
     std::stringstream output;
-    output << "\tSender versions:" << std::endl << "\tCtrl: " << mpControlSender->getInterfaceVersion() << " | " << "Cmd: " << mpCommandSender->getInterfaceVersion() << " | " << "Routing: " << mpRoutingSender->getInterfaceVersion() << std::endl;
+    std::string versionCommand;
+    std::string versionRouting;
+    std::string versionControl;
+    mpControlSender->getInterfaceVersion(versionControl);
+    mpRoutingSender->getInterfaceVersion(versionRouting);
+    mpCommandSender->getInterfaceVersion(versionCommand);
+    output << "\tSender versions:" << std::endl << "\tCtrl: " << versionControl << " | " << "Cmd: " << versionCommand << " | " << "Routing: " << versionRouting << std::endl;
 
     sendTelnetLine(filedescriptor, output);
 }
@@ -760,7 +766,13 @@ void CAmTelnetMenuHelper::getReceiverversionCommandExec(std::queue<std::string>
     (void) CmdQueue;
 
     std::stringstream output;
-    output << "\tReceiver versions:" << std::endl << "\tCtrl: " << mpControlReceiver->getInterfaceVersion() << " | " << "Cmd: " << mpCommandReceiver->getInterfaceVersion() << " | " << "Routing: " << mpRoutingReceiver->getInterfaceVersion() << std::endl;
+    std::string versionCommand;
+    std::string versionRouting;
+    std::string versionControl;
+    mpControlReceiver->getInterfaceVersion(versionControl);
+    mpRoutingReceiver->getInterfaceVersion(versionRouting);
+    mpCommandReceiver->getInterfaceVersion(versionCommand);
+    output << "\tReceiver versions:" << std::endl << "\tCtrl: " << versionControl << " | " << "Cmd: " <<  versionCommand << " | " << "Routing: " << versionRouting << std::endl;
 
     sendTelnetLine(filedescriptor, output);
 
diff --git a/AudioManagerDaemon/src/CommandReceiver.cpp b/AudioManagerDaemon/src/CommandReceiver.cpp
index ff092dd..74b819b 100644
--- a/AudioManagerDaemon/src/CommandReceiver.cpp
+++ b/AudioManagerDaemon/src/CommandReceiver.cpp
@@ -29,13 +29,19 @@
 #include <SocketHandler.h>
 #include <config.h>
 #include <cassert>
+#include <algorithm>
 
 using namespace am;
 
 CommandReceiver::CommandReceiver(DatabaseHandler *iDatabaseHandler, ControlSender *iControlSender, SocketHandler *iSocketHandler) :
         mDatabaseHandler(iDatabaseHandler), //
         mControlSender(iControlSender), //
-        mSocketHandler(iSocketHandler)
+        mSocketHandler(iSocketHandler), //
+        mListStartupHandles(), //
+        mListRundownHandles(), //
+        mWaitStartup(false), //
+        mWaitRundown(false)
+
 {
     assert(mDatabaseHandler!=NULL);
     assert(mSocketHandler!=NULL);
@@ -46,7 +52,11 @@ CommandReceiver::CommandReceiver(DatabaseHandler *iDatabaseHandler, ControlSende
         mDatabaseHandler(iDatabaseHandler), //
         mControlSender(iControlSender), //
         mDBusWrapper(iDBusWrapper), //
-        mSocketHandler(iSocketHandler)
+        mSocketHandler(iSocketHandler), //
+        mListStartupHandles(), //
+        mListRundownHandles(), //
+        mWaitStartup(false), //
+        mWaitRundown(false)
 {
     assert(mDatabaseHandler!=NULL);
     assert(mSocketHandler!=NULL);
@@ -168,8 +178,46 @@ am_Error_e CommandReceiver::getSocketHandler(SocketHandler *& socketHandler) con
     return E_OK;
 }
 
-uint16_t CommandReceiver::getInterfaceVersion() const
+void CommandReceiver::getInterfaceVersion(std::string & version) const
+{
+    version = CommandReceiveVersion;
+}
+
+void CommandReceiver::confirmCommandReady(const uint16_t handle)
+{
+    mListStartupHandles.erase(std::remove(mListStartupHandles.begin(), mListStartupHandles.end(), handle), mListStartupHandles.end());
+    if (mWaitStartup && mListStartupHandles.empty())
+        mControlSender->confirmCommandReady();
+}
+
+void CommandReceiver::confirmCommandRundown(const uint16_t handle)
+{
+    mListRundownHandles.erase(std::remove(mListRundownHandles.begin(), mListRundownHandles.end(), handle), mListRundownHandles.end());
+    if (mWaitRundown && mListRundownHandles.empty())
+        mControlSender->confirmCommandRundown();
+}
+
+uint16_t CommandReceiver::getStartupHandle()
+{
+    uint16_t handle = ++handleCount; //todo: handle overflow
+    mListStartupHandles.push_back(handle);
+    return handle;
+}
+
+uint16_t CommandReceiver::getRundownHandle()
+{
+    uint16_t handle = ++handleCount; //todo: handle overflow
+    mListRundownHandles.push_back(handle);
+    return handle;
+}
+
+void am::CommandReceiver::waitOnStartup(bool startup)
+{
+    mWaitStartup = startup;
+}
+
+void am::CommandReceiver::waitOnRundown(bool rundown)
 {
-    return CommandReceiveVersion;
+    mWaitRundown = rundown;
 }
 
diff --git a/AudioManagerDaemon/src/CommandSender.cpp b/AudioManagerDaemon/src/CommandSender.cpp
index c70509f..c613a4e 100644
--- a/AudioManagerDaemon/src/CommandSender.cpp
+++ b/AudioManagerDaemon/src/CommandSender.cpp
@@ -23,14 +23,17 @@
  */
 
 #include "CommandSender.h"
-#include "command/CommandReceiveInterface.h"
 #include <dirent.h>
+#include <sstream>
+#include <string>
+#include "CommandReceiver.h"
 #include "PluginTemplate.h"
 #include "DLTWrapper.h"
 
 using namespace am;
 
-#define REQUIRED_INTERFACE_VERSION 1
+#define REQUIRED_INTERFACE_VERSION_MAJOR 1
+#define REQUIRED_INTERFACE_VERSION_MINOR 0
 
 //!< macro to call all interfaces
 #define CALL_ALL_INTERFACES(...) 														 \
@@ -43,8 +46,9 @@ using namespace am;
 
 CommandSender::CommandSender(const std::vector<std::string>& listOfPluginDirectories) :
         mListInterfaces(), //
-        mListLibraryHandles(),
-        mListLibraryNames()
+        mListLibraryHandles(), //
+        mListLibraryNames(), //
+        mCommandReceiver()
 {
     std::vector<std::string> sharedLibraryNameList;
     std::vector<std::string>::const_iterator dirIter = listOfPluginDirectories.begin();
@@ -54,12 +58,12 @@ CommandSender::CommandSender(const std::vector<std::string>& listOfPluginDirecto
     for (; dirIter < dirIterEnd; ++dirIter)
     {
         const char* directoryName = dirIter->c_str();
-        logInfo("Searching for CommandPlugins in" , *dirIter);
+        logInfo("Searching for CommandPlugins in", *dirIter);
         DIR *directory = opendir(directoryName);
 
         if (!directory)
         {
-            logError("Error opening directory ",*dirIter);
+            logError("Error opening directory ", *dirIter);
             continue;
         }
 
@@ -108,9 +112,15 @@ CommandSender::CommandSender(const std::vector<std::string>& listOfPluginDirecto
         }
 
         //check libversion
-        if (commander->getInterfaceVersion() < REQUIRED_INTERFACE_VERSION)
+        std::string version;
+        commander->getInterfaceVersion(version);
+        uint16_t minorVersion, majorVersion;
+        std::istringstream(version.substr(0, 1)) >> majorVersion;
+        std::istringstream(version.substr(2, 1)) >> minorVersion;
+
+        if (majorVersion < REQUIRED_INTERFACE_VERSION_MAJOR || ((majorVersion == REQUIRED_INTERFACE_VERSION_MAJOR) && (minorVersion > REQUIRED_INTERFACE_VERSION_MINOR)))
         {
-            logInfo("RoutingPlugin initialization failed. Version of Interface to old");
+            logInfo("CommandInterface initialization failed. Version of Interface to old");
             continue;
         }
 
@@ -125,32 +135,16 @@ CommandSender::~CommandSender()
     unloadLibraries();
 }
 
-am_Error_e CommandSender::stopInterface()
-{
-    am_Error_e returnError = E_OK;
-
-    std::vector<CommandSendInterface*>::iterator iter = mListInterfaces.begin();
-    std::vector<CommandSendInterface*>::iterator iterEnd = mListInterfaces.end();
-    for (; iter < iterEnd; ++iter)
-    {
-        am_Error_e error = (*iter)->stopInterface();
-        if (error != E_OK)
-        {
-            returnError = error;
-        }
-    }
-    return returnError;
-}
-
-am_Error_e CommandSender::startupInterface(CommandReceiveInterface *commandreceiveinterface)
+am_Error_e CommandSender::startupInterfaces(CommandReceiver *iCommandReceiver)
 {
+    mCommandReceiver = iCommandReceiver;
     am_Error_e returnError = E_OK;
 
     std::vector<CommandSendInterface*>::iterator iter = mListInterfaces.begin();
     std::vector<CommandSendInterface*>::iterator iterEnd = mListInterfaces.end();
     for (; iter < iterEnd; ++iter)
     {
-        am_Error_e error = (*iter)->startupInterface(commandreceiveinterface);
+        am_Error_e error = (*iter)->startupInterface(iCommandReceiver);
         if (error != E_OK)
         {
             returnError = error;
@@ -159,31 +153,6 @@ am_Error_e CommandSender::startupInterface(CommandReceiveInterface *commandrecei
     return returnError;
 }
 
-void CommandSender::cbCommunicationReady()
-{
-    CALL_ALL_INTERFACES(cbCommunicationReady())
-}
-
-void CommandSender::cbCommunicationRundown()
-{
-    CALL_ALL_INTERFACES(cbCommunicationRundown())
-}
-
-void CommandSender::cbNumberOfMainConnectionsChanged()
-{
-    CALL_ALL_INTERFACES(cbNumberOfMainConnectionsChanged())
-}
-
-void CommandSender::cbNumberOfSinksChanged()
-{
-    CALL_ALL_INTERFACES(cbNumberOfSinksChanged())
-}
-
-void CommandSender::cbNumberOfSourcesChanged()
-{
-    CALL_ALL_INTERFACES(cbNumberOfSourcesChanged())
-}
-
 void CommandSender::cbNumberOfSinkClassesChanged()
 {
     CALL_ALL_INTERFACES(cbNumberOfSinkClassesChanged())
@@ -199,12 +168,12 @@ void CommandSender::cbMainConnectionStateChanged(const am_mainConnectionID_t con
     CALL_ALL_INTERFACES(cbMainConnectionStateChanged(connectionID,connectionState))
 }
 
-void CommandSender::cbMainSinkSoundPropertyChanged(const am_sinkID_t sinkID, const am_MainSoundProperty_s SoundProperty)
+void CommandSender::cbMainSinkSoundPropertyChanged(const am_sinkID_t sinkID, const am_MainSoundProperty_s& SoundProperty)
 {
     CALL_ALL_INTERFACES(cbMainSinkSoundPropertyChanged(sinkID,SoundProperty))
 }
 
-void CommandSender::cbMainSourceSoundPropertyChanged(const am_sourceID_t sourceID, const am_MainSoundProperty_s & SoundProperty)
+void CommandSender::cbMainSourceSoundPropertyChanged(const am_sourceID_t sourceID, const am_MainSoundProperty_s& SoundProperty)
 {
     CALL_ALL_INTERFACES(cbMainSourceSoundPropertyChanged(sourceID,SoundProperty))
 }
@@ -239,34 +208,69 @@ void CommandSender::cbTimingInformationChanged(const am_mainConnectionID_t mainC
     CALL_ALL_INTERFACES(cbTimingInformationChanged(mainConnection,time))
 }
 
-am_Error_e am::CommandSender::getListPlugins(std::vector<std::string> & interfaces) const
+void CommandSender::cbNewMainConnection(const am_MainConnectionType_s mainConnection)
 {
-   interfaces = mListLibraryNames;
-   return E_OK;
+    CALL_ALL_INTERFACES(cbNewMainConnection(mainConnection))
 }
 
-void am::CommandSender::cbNewMainConnection(const am_MainConnectionType_s mainConnection)
+void CommandSender::cbRemovedMainConnection(const am_mainConnectionID_t mainConnection)
 {
+    CALL_ALL_INTERFACES(cbRemovedMainConnection(mainConnection))
 }
 
-void am::CommandSender::cbRemovedMainConnection(const am_MainConnectionType_s mainConnection)
+void CommandSender::cbNewSink(const am_SinkType_s sink)
 {
+    CALL_ALL_INTERFACES(cbNewSink(sink))
 }
 
-void am::CommandSender::cbNewSink(const am_SinkType_s sink)
+void CommandSender::cbRemovedSink(const am_sinkID_t sink)
 {
+    CALL_ALL_INTERFACES(cbRemovedSink(sink))
 }
 
-void am::CommandSender::cbRemovedSink(const am_SinkType_s sink)
+void CommandSender::cbNewSource(const am_SourceType_s source)
 {
+    CALL_ALL_INTERFACES(cbNewSource(source))
 }
 
-void am::CommandSender::cbNewSource(const am_SourceType_s source)
+void CommandSender::cbRemovedSource(const am_sourceID_t source)
 {
+    CALL_ALL_INTERFACES(cbRemovedSource(source))
 }
 
-void am::CommandSender::cbRemovedSource(const am_SourceType_s source)
+void CommandSender::setCommandReady()
 {
+    mCommandReceiver->waitOnStartup(false);
+    std::vector<CommandSendInterface*>::iterator iter = mListInterfaces.begin();
+    std::vector<CommandSendInterface*>::iterator iterEnd = mListInterfaces.end();
+    for (; iter < iterEnd; ++iter)
+    {
+        (*iter)->setCommandReady(mCommandReceiver->getStartupHandle());
+    }
+    mCommandReceiver->waitOnStartup(true);
+}
+
+void CommandSender::setCommandRundown()
+{
+    mCommandReceiver->waitOnRundown(false);
+    std::vector<CommandSendInterface*>::iterator iter = mListInterfaces.begin();
+    std::vector<CommandSendInterface*>::iterator iterEnd = mListInterfaces.end();
+    for (; iter < iterEnd; ++iter)
+    {
+        (*iter)->setCommandRundown(mCommandReceiver->getRundownHandle());
+    }
+    mCommandReceiver->waitOnRundown(true);
+}
+
+void CommandSender::getInterfaceVersion(std::string & version) const
+{
+    version = CommandSendVersion;
+}
+
+am_Error_e am::CommandSender::getListPlugins(std::vector<std::string> & interfaces) const
+{
+    interfaces = mListLibraryNames;
+    return E_OK;
 }
 
 void CommandSender::unloadLibraries(void)
@@ -279,8 +283,3 @@ void CommandSender::unloadLibraries(void)
     mListLibraryHandles.clear();
 }
 
-uint16_t CommandSender::getInterfaceVersion() const
-{
-    return CommandSendVersion;
-}
-
diff --git a/AudioManagerDaemon/src/ControlReceiver.cpp b/AudioManagerDaemon/src/ControlReceiver.cpp
index 2b2e8b0..8ef8d23 100644
--- a/AudioManagerDaemon/src/ControlReceiver.cpp
+++ b/AudioManagerDaemon/src/ControlReceiver.cpp
@@ -468,13 +468,23 @@ am_Error_e ControlReceiver::removeSourceClassDB(const am_sourceClass_t sourceCla
 void ControlReceiver::setCommandReady()
 {
     logInfo("ControlReceiver::setCommandReady got called");
-    mCommandSender->cbCommunicationReady();
+    mCommandSender->setCommandReady();
 }
 
 void ControlReceiver::setRoutingReady()
 {
     logInfo("ControlReceiver::setRoutingReady got called");
-    mRoutingSender->routingInterfacesReady();
+    mRoutingSender->setRoutingReady();
+}
+
+void ControlReceiver::confirmControllerReady()
+{
+    //todo: one time implement here system interaction with NSM
+}
+
+void ControlReceiver::confirmControllerRundown()
+{
+    //todo: one time implement here system interaction with NSM
 }
 
 am_Error_e ControlReceiver::getSocketHandler(SocketHandler *& socketHandler)
@@ -483,20 +493,22 @@ am_Error_e ControlReceiver::getSocketHandler(SocketHandler *& socketHandler)
     return E_OK;
 }
 
-void am::ControlReceiver::setCommandRundown()
+void ControlReceiver::setCommandRundown()
 {
     logInfo("ControlReceiver::setCommandRundown got called");
-    mCommandSender->cbCommunicationRundown();
+    mCommandSender->setCommandRundown();
 }
 
-void am::ControlReceiver::setRoutingRundown()
+void ControlReceiver::setRoutingRundown()
 {
     logInfo("ControlReceiver::setRoutingRundown got called");
-    mRoutingSender->routingInterfacesRundown();
+    mRoutingSender->setRoutingRundown();
 }
 
-uint16_t ControlReceiver::getInterfaceVersion() const
+void ControlReceiver::getInterfaceVersion(std::string & version) const
 {
-    return ControlReceiveVersion;
+    version = ControlReceiveVersion;
 }
 
+
+
diff --git a/AudioManagerDaemon/src/ControlSender.cpp b/AudioManagerDaemon/src/ControlSender.cpp
index a334475..492244e 100644
--- a/AudioManagerDaemon/src/ControlSender.cpp
+++ b/AudioManagerDaemon/src/ControlSender.cpp
@@ -27,10 +27,14 @@
 #include "DLTWrapper.h"
 #include <cassert>
 #include <fstream>
+#include <iostream>
+#include <sstream>
+#include <stdexcept>
 
 using namespace am;
 
-#define REQUIRED_MIN_INTERFACE_VERSION 1
+#define REQUIRED_INTERFACE_VERSION_MAJOR 1
+#define REQUIRED_INTERFACE_VERSION_MINOR 0
 
 ControlSender::ControlSender(std::string controlPluginFile) :
         mlibHandle(NULL), //
@@ -49,7 +53,17 @@ ControlSender::ControlSender(std::string controlPluginFile) :
         mController = createFunc();
 
         //check libversion
-        assert(REQUIRED_MIN_INTERFACE_VERSION<=mController->getInterfaceVersion());
+        std::string version;
+        mController->getInterfaceVersion(version);
+        uint16_t minorVersion, majorVersion;
+        std::istringstream(version.substr(0, 1)) >> majorVersion;
+        std::istringstream(version.substr(2, 1)) >> minorVersion;
+
+        if (majorVersion < REQUIRED_INTERFACE_VERSION_MAJOR || ((majorVersion == REQUIRED_INTERFACE_VERSION_MAJOR) && (minorVersion > REQUIRED_INTERFACE_VERSION_MINOR)))
+        {
+            logError("ControlSender::ControlSender: Interface Version of Controller too old, exiting now");
+            throw std::runtime_error("Interface Version of Controller too old");
+        }
     }
     else
     {
@@ -63,11 +77,6 @@ ControlSender::~ControlSender()
         dlclose(mlibHandle);
 }
 
-void ControlSender::hookAllPluginsLoaded()
-{
-    mController->hookAllPluginsLoaded();
-}
-
 am_Error_e ControlSender::hookUserConnectionRequest(const am_sourceID_t sourceID, const am_sinkID_t sinkID, am_mainConnectionID_t & mainConnectionID)
 {
     return mController->hookUserConnectionRequest(sourceID, sinkID, mainConnectionID);
@@ -248,11 +257,6 @@ am_Error_e ControlSender::startupController(ControlReceiveInterface *controlrece
     return mController->startupController(controlreceiveinterface);
 }
 
-am_Error_e ControlSender::stopController()
-{
-    return mController->stopController();
-}
-
 void ControlSender::cbAckSetSinkSoundProperty(const am_Handle_s handle, const am_Error_e error)
 {
     mController->cbAckSetSinkSoundProperty(handle, error);
@@ -268,13 +272,43 @@ void ControlSender::cbAckSetSourceSoundProperties(const am_Handle_s handle, cons
     mController->cbAckSetSourceSoundProperties(handle, error);
 }
 
+void ControlSender::setControllerReady()
+{
+    mController->setControllerReady();
+}
+
+void ControlSender::setControllerRundown()
+{
+    mController->setControllerRundown();
+}
+
 am_Error_e am::ControlSender::getConnectionFormatChoice(const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_Route_s listRoute, const std::vector<am_ConnectionFormat_e> listPossibleConnectionFormats, std::vector<am_ConnectionFormat_e> & listPrioConnectionFormats)
 {
     return mController->getConnectionFormatChoice(sourceID, sinkID, listRoute, listPossibleConnectionFormats, listPrioConnectionFormats);
 }
 
-uint16_t ControlSender::getInterfaceVersion() const
+void ControlSender::getInterfaceVersion(std::string & version) const
+{
+    version = ControlSendVersion;
+}
+
+void ControlSender::confirmCommandReady()
+{
+    mController->confirmCommandReady();
+}
+
+void ControlSender::confirmRoutingReady()
+{
+    mController->confirmRoutingReady();
+}
+
+void ControlSender::confirmCommandRundown()
+{
+    mController->confirmCommandRundown();
+}
+
+void ControlSender::confirmRoutingRundown()
 {
-    return ControlSendVersion;
+    mController->confirmRoutingRundown();
 }
 
diff --git a/AudioManagerDaemon/src/DBusWrapper.cpp b/AudioManagerDaemon/src/DBusWrapper.cpp
index bfe6706..71352ef 100644
--- a/AudioManagerDaemon/src/DBusWrapper.cpp
+++ b/AudioManagerDaemon/src/DBusWrapper.cpp
@@ -103,7 +103,7 @@ DBusWrapper::DBusWrapper(SocketHandler* socketHandler) :
     }
     if (DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER != ret)
     {
-        logError("DBusWrapper::DBusWrapper Wrapper is not the Primary Owner",ret);
+        logError("DBusWrapper::DBusWrapper Wrapper is not the Primary Owner ! Another instance already running?",ret);
         exit(1);
     }
 }
diff --git a/AudioManagerDaemon/src/DatabaseHandler.cpp b/AudioManagerDaemon/src/DatabaseHandler.cpp
index a80e241..54e0129 100644
--- a/AudioManagerDaemon/src/DatabaseHandler.cpp
+++ b/AudioManagerDaemon/src/DatabaseHandler.cpp
@@ -262,7 +262,13 @@ am_Error_e DatabaseHandler::enterMainConnectionDB(const am_MainConnection_s & ma
 
     if (mDatabaseObserver)
     {
-        mDatabaseObserver->numberOfMainConnectionsChanged();
+        am_MainConnectionType_s mainConnection;
+        mainConnection.mainConnectionID=connectionID;
+        mainConnection.connectionState=mainConnectionData.connectionState;
+        mainConnection.delay=delay;
+        mainConnection.sinkID=mainConnectionData.sinkID;
+        mainConnection.sourceID=mainConnectionData.sourceID;
+        mDatabaseObserver->newMainConnection(mainConnection);
         mDatabaseObserver->mainConnectionStateChanged(connectionID, mainConnectionData.connectionState);
     }
 
@@ -1227,7 +1233,7 @@ am_Error_e DatabaseHandler::removeMainConnectionDB(const am_mainConnectionID_t m
     if (mDatabaseObserver)
     {
         mDatabaseObserver->mainConnectionStateChanged(mainConnectionID, CS_DISCONNECTED);
-        mDatabaseObserver->numberOfMainConnectionsChanged();
+        mDatabaseObserver->removedMainConnection(mainConnectionID);
     }
     return E_OK;
 }
@@ -1240,6 +1246,9 @@ am_Error_e DatabaseHandler::removeSinkDB(const am_sinkID_t sinkID)
     {
         return E_NON_EXISTENT;
     }
+
+    bool visible=sinkVisible(sinkID);
+
     std::string command = "DELETE from " + std::string(SINK_TABLE) + " WHERE sinkID=" + i2s(sinkID);
     std::string command1 = "DROP table SinkConnectionFormat" + i2s(sinkID);
     std::string command2 = "DROP table SinkMainSoundProperty" + i2s(sinkID);
@@ -1255,7 +1264,7 @@ am_Error_e DatabaseHandler::removeSinkDB(const am_sinkID_t sinkID)
     logInfo("DatabaseHandler::removeSinkDB removed:", sinkID);
 
     if (mDatabaseObserver != NULL)
-        mDatabaseObserver->removedSink(sinkID);
+        mDatabaseObserver->removedSink(sinkID,visible);
 
     return E_OK;
 }
@@ -1268,6 +1277,9 @@ am_Error_e DatabaseHandler::removeSourceDB(const am_sourceID_t sourceID)
     {
         return E_NON_EXISTENT;
     }
+
+    bool visible=sourceVisible(sourceID);
+
     std::string command = "DELETE from " + std::string(SOURCE_TABLE) + " WHERE sourceID=" + i2s(sourceID);
     std::string command1 = "DROP table SourceConnectionFormat" + i2s(sourceID);
     std::string command2 = "DROP table SourceMainSoundProperty" + i2s(sourceID);
@@ -1282,7 +1294,7 @@ am_Error_e DatabaseHandler::removeSourceDB(const am_sourceID_t sourceID)
         return E_DATABASE_ERROR;
     logInfo("DatabaseHandler::removeSourceDB removed:", sourceID);
     if (mDatabaseObserver)
-        mDatabaseObserver->removedSource(sourceID);
+        mDatabaseObserver->removedSource(sourceID,visible);
     return E_OK;
 }
 
diff --git a/AudioManagerDaemon/src/DatabaseObserver.cpp b/AudioManagerDaemon/src/DatabaseObserver.cpp
index a1bc123..93031ef 100644
--- a/AudioManagerDaemon/src/DatabaseObserver.cpp
+++ b/AudioManagerDaemon/src/DatabaseObserver.cpp
@@ -16,7 +16,7 @@
  * 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.
+ * Linking AudioManager statiasyncCally or dynamiasyncCally 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.
  *
@@ -32,317 +32,175 @@
 #include "RoutingSender.h"
 #include "TelnetServer.h"
 #include "DLTWrapper.h"
+//#include "CAmSerializer.h"
 
 using namespace am;
 
 DatabaseObserver::DatabaseObserver(CommandSender *iCommandSender, RoutingSender *iRoutingSender, SocketHandler *iSocketHandler) :
-        receiverCallbackT(this, &DatabaseObserver::receiverCallback), //
-        dispatcherCallbackT(this, &DatabaseObserver::dispatcherCallback), //
-        checkerCallbackT(this, &DatabaseObserver::checkerCallback), //
         mCommandSender(iCommandSender), //
         mRoutingSender(iRoutingSender), //
-        mSocketHandler(iSocketHandler), //
-        mPipe(), //
-        mHandle(), //
-        mQueue()
+        mSerializer(iSocketHandler) //
 {
-    commonConstructor();
+    assert(mCommandSender!=0);
+    assert(mRoutingSender!=0);
+    assert(iSocketHandler!=0);
 }
 
 DatabaseObserver::DatabaseObserver(CommandSender *iCommandSender, RoutingSender *iRoutingSender, SocketHandler *iSocketHandler, TelnetServer *iTelnetServer) :
-        receiverCallbackT(this, &DatabaseObserver::receiverCallback), //
-        dispatcherCallbackT(this, &DatabaseObserver::dispatcherCallback), //
-        checkerCallbackT(this, &DatabaseObserver::checkerCallback), //
         mCommandSender(iCommandSender), //
         mRoutingSender(iRoutingSender), //
         mTelnetServer(iTelnetServer), //
-        mSocketHandler(iSocketHandler), //
-        mPipe(), //
-        mHandle(), //
-        mQueue()
+        mSerializer(iSocketHandler) //
 {
     assert(mTelnetServer!=0);
-    commonConstructor();
+    assert(mCommandSender!=0);
+    assert(mRoutingSender!=0);
+    assert(iSocketHandler!=0);
 }
 
-void DatabaseObserver::pipeCommand(const do_msg_s & message)
+DatabaseObserver::~DatabaseObserver()
 {
-    mQueue.push(message);
-
-    if (write(mPipe[1], &message.msgID, sizeof(do_msg_s)) == -1)
-    {
-        logError("DatabaseObserver::msgID pipe write failed, error code:", strerror(errno));
-    }
 }
 
-void DatabaseObserver::commonConstructor()
+void DatabaseObserver::newMainConnection(const am_MainConnectionType_s& mainConnection)
 {
-    assert(mCommandSender!=0);
-    assert(mRoutingSender!=0);
-    assert(mSocketHandler!=0);
-    if (pipe(mPipe) == -1)
-    {
-        logError("RoutingReceiverAsyncShadow::setRoutingInterface could not create pipe!:");
-        throw "could not create pipe";
-    }
-
-    short event = 0;
-    event |= POLLIN;
-    mSocketHandler->addFDPoll(mPipe[0], event, NULL, &receiverCallbackT, &checkerCallbackT, &dispatcherCallbackT, NULL, mHandle);
+    mSerializer.asyncCall<CommandSender, const am_MainConnectionType_s>(mCommandSender, &CommandSender::cbNewMainConnection, mainConnection);
 }
 
-DatabaseObserver::~DatabaseObserver()
+void DatabaseObserver::removedMainConnection(const am_mainConnectionID_t mainConnection)
 {
+    mSerializer.asyncCall<CommandSender, const am_mainConnectionID_t>(mCommandSender, &CommandSender::cbRemovedMainConnection, mainConnection);
 }
 
-void DatabaseObserver::newSink(am_Sink_s sink)
+void DatabaseObserver::newSink(const am_Sink_s& sink)
 {
     mRoutingSender->addSinkLookup(sink);
-    do_msg_s msg;
-    msg.msgID = MDO_cbNumberOfSinksChanged;
-    pipeCommand(msg);
-
+    if (sink.visible)
+    {
+        am_SinkType_s s;
+        s.availability = sink.available;
+        s.muteState = sink.muteState;
+        s.name = sink.name;
+        s.sinkClassID = sink.sinkClassID;
+        s.sinkID = sink.sinkID;
+        s.volume = sink.mainVolume;
+        mSerializer.asyncCall<CommandSender, const am_SinkType_s>(mCommandSender, &CommandSender::cbNewSink, s);
+    }
 }
 
-void DatabaseObserver::newSource(am_Source_s source)
+void DatabaseObserver::newSource(const am_Source_s& source)
 {
     mRoutingSender->addSourceLookup(source);
-    do_msg_s msg;
-    msg.msgID = MDO_cbNumberOfSourcesChanged;
-    pipeCommand(msg);
+    if (source.visible)
+    {
+        am_SourceType_s s;
+        s.availability = source.available;
+        s.name = source.name;
+        s.sourceClassID = source.sourceClassID;
+        s.sourceID = source.sourceID;
+        mSerializer.asyncCall<CommandSender, const am_SourceType_s>(mCommandSender, &CommandSender::cbNewSource, s);
+    }
 }
 
-void DatabaseObserver::newDomain(am_Domain_s domain)
+void DatabaseObserver::newDomain(const am_Domain_s& domain)
 {
     mRoutingSender->addDomainLookup(domain);
 }
 
-void DatabaseObserver::newGateway(am_Gateway_s gateway)
+void DatabaseObserver::newGateway(const am_Gateway_s& gateway)
 {
     (void) gateway;
     //todo: implement something
 }
 
-void DatabaseObserver::newCrossfader(am_Crossfader_s crossfader)
+void DatabaseObserver::newCrossfader(const am_Crossfader_s& crossfader)
 {
     mRoutingSender->addCrossfaderLookup(crossfader);
 }
 
-void DatabaseObserver::removedSink(am_sinkID_t sinkID)
+void DatabaseObserver::removedSink(const am_sinkID_t sinkID, const bool visible)
 {
     mRoutingSender->removeSinkLookup(sinkID);
-    do_msg_s msg;
-    msg.msgID = MDO_cbNumberOfSinksChanged;
-    pipeCommand(msg);
+
+    if (visible)
+        mSerializer.asyncCall<CommandSender, const am_sinkID_t>(mCommandSender, &CommandSender::cbRemovedSink, sinkID);
 }
 
-void DatabaseObserver::removedSource(am_sourceID_t sourceID)
+void DatabaseObserver::removedSource(const am_sourceID_t sourceID, const bool visible)
 {
     mRoutingSender->removeSourceLookup(sourceID);
-    do_msg_s msg;
-    msg.msgID = MDO_cbNumberOfSourcesChanged;
-    pipeCommand(msg);
+
+    if (visible)
+        mSerializer.asyncCall<CommandSender, const am_sourceID_t>(mCommandSender, &CommandSender::cbRemovedSource, sourceID);
 }
 
-void DatabaseObserver::removeDomain(am_domainID_t domainID)
+void DatabaseObserver::removeDomain(const am_domainID_t domainID)
 {
     mRoutingSender->removeDomainLookup(domainID);
 }
 
-void DatabaseObserver::removeGateway(am_gatewayID_t gatewayID)
+void DatabaseObserver::removeGateway(const am_gatewayID_t gatewayID)
 {
     (void) gatewayID;
-    //todo: implement something
+    //todo: implement something?
 }
 
-void DatabaseObserver::removeCrossfader(am_crossfaderID_t crossfaderID)
+void DatabaseObserver::removeCrossfader(const am_crossfaderID_t crossfaderID)
 {
     mRoutingSender->removeCrossfaderLookup(crossfaderID);
 }
 
-void DatabaseObserver::numberOfMainConnectionsChanged()
-{
-    do_msg_s msg;
-    msg.msgID = MDO_cbNumberOfMainConnectionsChanged;
-    pipeCommand(msg);
-}
-
 void DatabaseObserver::numberOfSinkClassesChanged()
 {
-    do_msg_s msg;
-    msg.msgID = MDO_cbNumberOfSinkClassesChanged;
-    pipeCommand(msg);
+    mSerializer.asyncCall<CommandSender>(mCommandSender, &CommandSender::cbNumberOfSinkClassesChanged);
 }
 
 void DatabaseObserver::numberOfSourceClassesChanged()
 {
-    do_msg_s msg;
-    msg.msgID = MDO_cbNumberOfSourceClassesChanged;
-    pipeCommand(msg);
+    mSerializer.asyncCall<CommandSender>(mCommandSender, &CommandSender::cbNumberOfSourceClassesChanged);
 }
 
 void DatabaseObserver::mainConnectionStateChanged(const am_mainConnectionID_t connectionID, const am_ConnectionState_e connectionState)
 {
-    do_msg_s msg;
-    msg.msgID = MDO_cbMainConnectionStateChanged;
-    msg.parameters.connectionStateChanged.connectionID = connectionID;
-    msg.parameters.connectionStateChanged.connectionState = connectionState;
-    pipeCommand(msg);
+    mSerializer.asyncCall<CommandSender, const am_connectionID_t, const am_ConnectionState_e>(mCommandSender, &CommandSender::cbMainConnectionStateChanged, connectionID, connectionState);
 }
 
-void DatabaseObserver::mainSinkSoundPropertyChanged(const am_sinkID_t sinkID, const am_MainSoundProperty_s SoundProperty)
+void DatabaseObserver::mainSinkSoundPropertyChanged(const am_sinkID_t sinkID, const am_MainSoundProperty_s& SoundProperty)
 {
-    do_msg_s msg;
-    msg.msgID = MDO_cbMainSinkSoundPropertyChanged;
-    msg.parameters.mainSinkSoundPropertyChanged.sinkID = sinkID;
-    msg.parameters.mainSinkSoundPropertyChanged.SoundProperty = SoundProperty;
-    pipeCommand(msg);
+    mSerializer.asyncCall<CommandSender, const am_sinkID_t, const am_MainSoundProperty_s&>(mCommandSender, &CommandSender::cbMainSinkSoundPropertyChanged, sinkID, SoundProperty);
 }
 
 void DatabaseObserver::mainSourceSoundPropertyChanged(const am_sourceID_t sourceID, const am_MainSoundProperty_s & SoundProperty)
 {
-    do_msg_s msg;
-    msg.msgID = MDO_cbMainSourceSoundPropertyChanged;
-    msg.parameters.mainSourceSoundPropertyChanged.sourceID = sourceID;
-    msg.parameters.mainSourceSoundPropertyChanged.SoundProperty = SoundProperty;
-    pipeCommand(msg);
+    mSerializer.asyncCall<CommandSender, const am_sourceID_t, const am_MainSoundProperty_s&>(mCommandSender, &CommandSender::cbMainSourceSoundPropertyChanged, sourceID, SoundProperty);
 }
 
 void DatabaseObserver::sinkAvailabilityChanged(const am_sinkID_t sinkID, const am_Availability_s & availability)
 {
-    do_msg_s msg;
-    msg.msgID = MDO_cbSinkAvailabilityChanged;
-    msg.parameters.sinkAvailabilityChanged.sinkID = sinkID;
-    msg.parameters.sinkAvailabilityChanged.availability = availability;
-    pipeCommand(msg);
+    mSerializer.asyncCall<CommandSender, const am_sinkID_t, const am_Availability_s&>(mCommandSender, &CommandSender::cbSinkAvailabilityChanged, sinkID, availability);
 }
 
 void DatabaseObserver::sourceAvailabilityChanged(const am_sourceID_t sourceID, const am_Availability_s & availability)
 {
-    do_msg_s msg;
-    msg.msgID = MDO_cbSourceAvailabilityChanged;
-    msg.parameters.sourceAvailabilityChanged.sourceID = sourceID;
-    msg.parameters.sourceAvailabilityChanged.availability = availability;
-    pipeCommand(msg);
+    mSerializer.asyncCall<CommandSender, const am_sourceID_t, const am_Availability_s&>(mCommandSender, &CommandSender::cbSourceAvailabilityChanged, sourceID, availability);
 }
 
 void DatabaseObserver::volumeChanged(const am_sinkID_t sinkID, const am_mainVolume_t volume)
 {
-    do_msg_s msg;
-    msg.msgID = MDO_cbVolumeChanged;
-    msg.parameters.volumeChanged.sinkID = sinkID;
-    msg.parameters.volumeChanged.volume = volume;
-    pipeCommand(msg);
+    mSerializer.asyncCall<CommandSender, const am_sinkID_t, const am_mainVolume_t>(mCommandSender, &CommandSender::cbVolumeChanged, sinkID, volume);
 }
 
 void DatabaseObserver::sinkMuteStateChanged(const am_sinkID_t sinkID, const am_MuteState_e muteState)
 {
-    do_msg_s msg;
-    msg.msgID = MDO_cbSinkMuteStateChanged;
-    msg.parameters.sinkMuteStateChanged.sinkID = sinkID;
-    msg.parameters.sinkMuteStateChanged.muteState = muteState;
-    pipeCommand(msg);
+    mSerializer.asyncCall<CommandSender, const am_sinkID_t, const am_MuteState_e>(mCommandSender, &CommandSender::cbSinkMuteStateChanged, sinkID, muteState);
 }
 
-void DatabaseObserver::systemPropertyChanged(const am_SystemProperty_s & SystemProperty)
+void DatabaseObserver::systemPropertyChanged(const am_SystemProperty_s& SystemProperty)
 {
-    do_msg_s msg;
-    msg.msgID = MDO_cbSystemPropertyChanged;
-    msg.parameters.systemProperty = SystemProperty;
-    pipeCommand(msg);
+    mSerializer.asyncCall<CommandSender, const am_SystemProperty_s&>(mCommandSender, &CommandSender::cbSystemPropertyChanged, SystemProperty);
 }
 
 void DatabaseObserver::timingInformationChanged(const am_mainConnectionID_t mainConnection, const am_timeSync_t time)
 {
-    do_msg_s msg;
-    msg.msgID = MDO_cbTimingInformationChanged;
-    msg.parameters.timingInformationChanged.mainConnection = mainConnection;
-    msg.parameters.timingInformationChanged.time = time;
-    pipeCommand(msg);
-    //todo:inform the controller via controlsender
+    mSerializer.asyncCall<CommandSender, const am_mainConnectionID_t, const am_timeSync_t>(mCommandSender, &CommandSender::cbTimingInformationChanged, mainConnection, time);
 }
-
-void DatabaseObserver::receiverCallback(const pollfd pollfd, const sh_pollHandle_t handle, void *userData)
-{
-    (void) handle;
-    (void) userData;
-    //it is no really important what to read here, we will read the queue later...
-    char buffer[10];
-    if (read(pollfd.fd, buffer, 10) == -1)
-    {
-        logError("DatabaseObserver::receiverCallback could not read pipe!");
-    }
-}
-
-bool DatabaseObserver::dispatcherCallback(const sh_pollHandle_t handle, void *userData)
-{
-    (void) handle;
-    (void) userData;
-    do_msg_s msg;
-
-    msg = mQueue.front();
-    mQueue.pop();
-
-    switch (msg.msgID)
-    {
-    case MDO_cbNumberOfSinksChanged:
-        mCommandSender->cbNumberOfSinksChanged();
-        break;
-    case MDO_cbNumberOfSourcesChanged:
-        mCommandSender->cbNumberOfSourcesChanged();
-        break;
-    case MDO_cbNumberOfMainConnectionsChanged:
-        mCommandSender->cbNumberOfMainConnectionsChanged();
-        break;
-    case MDO_cbNumberOfSinkClassesChanged:
-        mCommandSender->cbNumberOfSinkClassesChanged();
-        break;
-    case MDO_cbNumberOfSourceClassesChanged:
-        mCommandSender->cbNumberOfSourceClassesChanged();
-        break;
-    case MDO_cbMainConnectionStateChanged:
-        mCommandSender->cbMainConnectionStateChanged(msg.parameters.connectionStateChanged.connectionID, msg.parameters.connectionStateChanged.connectionState);
-        break;
-    case MDO_cbMainSinkSoundPropertyChanged:
-        mCommandSender->cbMainSinkSoundPropertyChanged(msg.parameters.mainSinkSoundPropertyChanged.sinkID, msg.parameters.mainSinkSoundPropertyChanged.SoundProperty);
-        break;
-    case MDO_cbMainSourceSoundPropertyChanged:
-        mCommandSender->cbMainSourceSoundPropertyChanged(msg.parameters.mainSourceSoundPropertyChanged.sourceID, msg.parameters.mainSourceSoundPropertyChanged.SoundProperty);
-        break;
-    case MDO_cbSinkAvailabilityChanged:
-        mCommandSender->cbSinkAvailabilityChanged(msg.parameters.sinkAvailabilityChanged.sinkID, msg.parameters.sinkAvailabilityChanged.availability);
-        break;
-    case MDO_cbSourceAvailabilityChanged:
-        mCommandSender->cbSourceAvailabilityChanged(msg.parameters.sourceAvailabilityChanged.sourceID, msg.parameters.sourceAvailabilityChanged.availability);
-        break;
-    case MDO_cbVolumeChanged:
-        mCommandSender->cbVolumeChanged(msg.parameters.volumeChanged.sinkID, msg.parameters.volumeChanged.volume);
-        break;
-    case MDO_cbSinkMuteStateChanged:
-        mCommandSender->cbSinkMuteStateChanged(msg.parameters.sinkMuteStateChanged.sinkID, msg.parameters.sinkMuteStateChanged.muteState);
-        break;
-    case MDO_cbSystemPropertyChanged:
-        mCommandSender->cbSystemPropertyChanged(msg.parameters.systemProperty);
-        break;
-    case MDO_cbTimingInformationChanged:
-        mCommandSender->cbTimingInformationChanged(msg.parameters.timingInformationChanged.mainConnection, msg.parameters.timingInformationChanged.time);
-        break;
-    default:
-        logError("Something went totally wrong in DatabaseObserver::dispatcherCallback");
-        break;
-    }
-
-    if (mQueue.size() > 0)
-        return (true);
-    return (false);
-}
-
-bool DatabaseObserver::checkerCallback(const sh_pollHandle_t handle, void *userData)
-{
-    (void) handle;
-    (void) userData;
-    if (mQueue.size() > 0)
-        return (true);
-    return (false);
-}
-
diff --git a/AudioManagerDaemon/src/RoutingReceiver.cpp b/AudioManagerDaemon/src/RoutingReceiver.cpp
index 49ee3f9..fb160b0 100644
--- a/AudioManagerDaemon/src/RoutingReceiver.cpp
+++ b/AudioManagerDaemon/src/RoutingReceiver.cpp
@@ -39,7 +39,11 @@ RoutingReceiver::RoutingReceiver(DatabaseHandler *iDatabaseHandler, RoutingSende
         mDatabaseHandler(iDatabaseHandler), //
         mRoutingSender(iRoutingSender), //
         mControlSender(iControlSender), //
-        mSocketHandler(iSocketHandler) //
+        mSocketHandler(iSocketHandler), //
+        mListStartupHandles(), //
+        mListRundownHandles(), //
+        mWaitStartup(false), //
+        mWaitRundown(false)
 {
     assert(mDatabaseHandler!=NULL);
     assert(mRoutingSender!=NULL);
@@ -52,7 +56,11 @@ RoutingReceiver::RoutingReceiver(DatabaseHandler *iDatabaseHandler, RoutingSende
         mRoutingSender(iRoutingSender), //
         mControlSender(iControlSender), //
         mSocketHandler(iSocketHandler), //
-        mDBusWrapper(iDBusWrapper) //
+        mDBusWrapper(iDBusWrapper), //
+        mListStartupHandles(), //
+        mListRundownHandles(), //
+        mWaitStartup(false), //
+        mWaitRundown(false)
 {
     assert(mDatabaseHandler!=NULL);
     assert(mRoutingSender!=NULL);
@@ -329,8 +337,41 @@ am_Error_e RoutingReceiver::getSocketHandler(SocketHandler *& socketHandler) con
     return E_OK;
 }
 
-uint16_t RoutingReceiver::getInterfaceVersion() const
+void RoutingReceiver::getInterfaceVersion(std::string & version) const
+{
+    version = RoutingReceiveVersion;
+}
+
+void RoutingReceiver::confirmRoutingReady(const uint16_t handle) const
+{
+
+}
+
+void RoutingReceiver::confirmRoutingRundown(const uint16_t handle) const
+{
+}
+
+uint16_t am::RoutingReceiver::getStartupHandle()
+{
+    uint16_t handle = ++handleCount; //todo: handle overflow
+    mListStartupHandles.push_back(handle);
+    return handle;
+}
+
+uint16_t am::RoutingReceiver::getRundownHandle()
+{
+    uint16_t handle = ++handleCount; //todo: handle overflow
+    mListRundownHandles.push_back(handle);
+    return handle;
+}
+
+void am::RoutingReceiver::waitOnStartup(bool startup)
+{
+    mWaitStartup = startup;
+}
+
+void am::RoutingReceiver::waitOnRundown(bool rundown)
 {
-    return RoutingReceiveVersion;
+    mWaitRundown = rundown;
 }
 
diff --git a/AudioManagerDaemon/src/RoutingSender.cpp b/AudioManagerDaemon/src/RoutingSender.cpp
index 16d04b0..76c671d 100644
--- a/AudioManagerDaemon/src/RoutingSender.cpp
+++ b/AudioManagerDaemon/src/RoutingSender.cpp
@@ -27,12 +27,17 @@
 #include <dirent.h>
 #include <dlfcn.h>
 #include <cassert>
+#include <iostream>
+#include <sstream>
+
+#include "RoutingReceiver.h"
 #include "PluginTemplate.h"
 #include "DLTWrapper.h"
 
 using namespace am;
 
-#define REQUIRED_INTERFACE_VERSION 1
+#define REQUIRED_INTERFACE_VERSION_MAJOR 1
+#define REQUIRED_INTERFACE_VERSION_MINOR 0
 
 #define CALL_ALL_INTERFACES(...) 														 \
 		std::vector<InterfaceNamePairs>::iterator iter = mListInterfaces.begin();	 	 \
@@ -51,7 +56,8 @@ RoutingSender::RoutingSender(const std::vector<std::string>& listOfPluginDirecto
         mMapDomainInterface(), //
         mMapSinkInterface(), //
         mMapSourceInterface(), //
-        mMapHandleInterface() //
+        mMapHandleInterface(), //
+        mRoutingReceiver()
 {
     std::vector<std::string> sharedLibraryNameList;
     std::vector<std::string>::const_iterator dirIter = listOfPluginDirectories.begin();
@@ -61,7 +67,7 @@ RoutingSender::RoutingSender(const std::vector<std::string>& listOfPluginDirecto
     for (; dirIter < dirIterEnd; ++dirIter)
     {
         const char* directoryName = dirIter->c_str();
-        logInfo("Searching for HookPlugins in",directoryName);
+        logInfo("Searching for HookPlugins in", directoryName);
         DIR *directory = opendir(directoryName);
 
         if (!directory)
@@ -101,7 +107,7 @@ RoutingSender::RoutingSender(const std::vector<std::string>& listOfPluginDirecto
 
     for (; iter != iterEnd; ++iter)
     {
-        logInfo("RoutingSender::RoutingSender try loading: " , *iter);
+        logInfo("RoutingSender::RoutingSender try loading: ", *iter);
 
         RoutingSendInterface* (*createFunc)();
         void* tempLibHandle = NULL;
@@ -125,9 +131,14 @@ RoutingSender::RoutingSender(const std::vector<std::string>& listOfPluginDirecto
         routerInterface.routingInterface = router;
 
         //check libversion
-        if (router->getInterfaceVersion() < REQUIRED_INTERFACE_VERSION)
+        std::string version;
+        router->getInterfaceVersion(version);
+        uint16_t minorVersion, majorVersion;
+        std::istringstream(version.substr(0, 1)) >> majorVersion;
+        std::istringstream(version.substr(2, 1)) >> minorVersion;
+        if (majorVersion < REQUIRED_INTERFACE_VERSION_MAJOR || ((majorVersion == REQUIRED_INTERFACE_VERSION_MAJOR) && (minorVersion > REQUIRED_INTERFACE_VERSION_MINOR)))
         {
-            logError("RoutingSender::RoutingSender RoutingPlugin initialization failed. Version of Interface to old");
+            logInfo("RoutingPlugin initialization failed. Version of Interface to old");
             continue;
         }
 
@@ -154,19 +165,22 @@ RoutingSender::~RoutingSender()
     }
 }
 
-void RoutingSender::routingInterfacesReady()
-{
-    CALL_ALL_INTERFACES(routingInterfacesReady())
-}
-
-void RoutingSender::routingInterfacesRundown()
+am_Error_e RoutingSender::startupInterfaces(RoutingReceiver *iRoutingReceiver)
 {
-    CALL_ALL_INTERFACES(routingInterfacesRundown())
-}
+    mRoutingReceiver = iRoutingReceiver;
+    am_Error_e returnError = E_OK;
 
-void RoutingSender::startupRoutingInterface(RoutingReceiveInterface *routingreceiveinterface)
-{
-    CALL_ALL_INTERFACES(startupRoutingInterface(routingreceiveinterface))
+    std::vector<InterfaceNamePairs>::iterator iter = mListInterfaces.begin();
+    std::vector<InterfaceNamePairs>::iterator iterEnd = mListInterfaces.end();
+    for (; iter < iterEnd; ++iter)
+    {
+        am_Error_e error = (*iter).routingInterface->startupInterface(iRoutingReceiver);
+        if (error != E_OK)
+        {
+            returnError = error;
+        }
+    }
+    return returnError;
 }
 
 am_Error_e RoutingSender::asyncAbort(const am_Handle_s& handle)
@@ -479,6 +493,30 @@ RoutingSender::am_handleData_c RoutingSender::returnHandleData(const am_Handle_s
     return (it->second);
 }
 
+void am::RoutingSender::setRoutingReady()
+{
+    mRoutingReceiver->waitOnStartup(false);
+    std::vector<InterfaceNamePairs>::iterator iter = mListInterfaces.begin();
+    std::vector<InterfaceNamePairs>::iterator iterEnd = mListInterfaces.end();
+    for (; iter < iterEnd; ++iter)
+    {
+        (*iter).routingInterface->setRoutingReady(mRoutingReceiver->getStartupHandle());
+    }
+    mRoutingReceiver->waitOnStartup(true);
+}
+
+void am::RoutingSender::setRoutingRundown()
+{
+    mRoutingReceiver->waitOnRundown(false);
+    std::vector<InterfaceNamePairs>::iterator iter = mListInterfaces.begin();
+    std::vector<InterfaceNamePairs>::iterator iterEnd = mListInterfaces.end();
+    for (; iter < iterEnd; ++iter)
+    {
+        (*iter).routingInterface->setRoutingRundown(mRoutingReceiver->getStartupHandle());
+    }
+    mRoutingReceiver->waitOnRundown(true);
+}
+
 void RoutingSender::unloadLibraries(void)
 {
     std::vector<void*>::iterator iterator = mListLibraryHandles.begin();
@@ -489,7 +527,7 @@ void RoutingSender::unloadLibraries(void)
     mListLibraryHandles.clear();
 }
 
-am_Error_e am::RoutingSender::getListPlugins(std::vector<std::string>& interfaces) const
+am_Error_e RoutingSender::getListPlugins(std::vector<std::string>& interfaces) const
 {
     std::vector<InterfaceNamePairs>::const_iterator it = mListInterfaces.begin();
     for (; it != mListInterfaces.end(); ++it)
@@ -499,8 +537,8 @@ am_Error_e am::RoutingSender::getListPlugins(std::vector<std::string>& interface
     return E_OK;
 }
 
-uint16_t RoutingSender::getInterfaceVersion() const
+void RoutingSender::getInterfaceVersion(std::string & version) const
 {
-    return (RoutingSendVersion);
+    version = RoutingSendVersion;
 }
 
diff --git a/AudioManagerDaemon/src/main.cpp b/AudioManagerDaemon/src/main.cpp
index b4f0e99..dee5edb 100644
--- a/AudioManagerDaemon/src/main.cpp
+++ b/AudioManagerDaemon/src/main.cpp
@@ -277,7 +277,7 @@ int main(int argc, char *argv[])
     TelnetServer iTelnetServer(&iSocketHandler, &iCommandSender, &iCommandReceiver, &iRoutingSender, &iRoutingReceiver, &iControlSender, &iControlReceiver, &iDatabaseHandler, &iRouter, telnetport, maxConnections);
     DatabaseObserver iObserver(&iCommandSender, &iRoutingSender, &iSocketHandler, &iTelnetServer);
 #else /*WITH_TELNET*/
-    DatabaseObserver iObserver(&iCommandSender, &iSocketHandler, &iRoutingSender);
+    DatabaseObserver iObserver(&iCommandSender,&iRoutingSender, &iSocketHandler);
 #endif
 #else /*WITH_DBUS_WRAPPER*/
     CommandReceiver iCommandReceiver(&iDatabaseHandler,&iControlSender,&iSocketHandler);
@@ -295,11 +295,11 @@ int main(int argc, char *argv[])
 
     //startup all the Plugins and Interfaces
     iControlSender.startupController(&iControlReceiver);
-    iCommandSender.startupInterface(&iCommandReceiver);
-    iRoutingSender.startupRoutingInterface(&iRoutingReceiver);
+    iCommandSender.startupInterfaces(&iCommandReceiver);
+    iRoutingSender.startupInterfaces(&iRoutingReceiver);
 
     //when the routingInterface is done, all plugins are loaded:
-    iControlSender.hookAllPluginsLoaded();
+    iControlSender.setControllerReady();
 
     //start the mainloop here....
     iSocketHandler.start_listenting();