* fully rework. Plugins have now a new own git repository

* building out of source of plugins without AM workss
* build system cmake contructions is different now

Signed-off-by: Christian Linke <christian.linke@bmw.de>

3 files changed, 0 insertions, 1636 deletions

diff --git a/PluginCommandInterfaceDbus/src/CAmCommandSenderDbus.cpp b/PluginCommandInterfaceDbus/src/CAmCommandSenderDbus.cpp
deleted file mode 100644
index eebfc00..0000000
--- a/PluginCommandInterfaceDbus/src/CAmCommandSenderDbus.cpp
+++ /dev/null
@@ -1,401 +0,0 @@
-/**
- *  Copyright (c) 2012 BMW
- *
- *  \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012
- *
- *  \copyright
- *  Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction,
- *  including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
- *  subject to the following conditions:
- *  The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- *  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- *  THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- *  For further information see http://www.genivi.org/.
- */
-
-#include "CAmCommandSenderDbus.h"
-#include <algorithm>
-#include <string>
-#include <vector>
-#include <cassert>
-#include <set>
-#include "CAmDbusMessageHandler.h"
-#include "shared/CAmDltWrapper.h"
-
-
-using namespace am;
-DLT_DECLARE_CONTEXT(commandDbus)
-
-
-/**
- * factory for plugin loading
- */
-extern "C" IAmCommandSend* PluginCommandInterfaceDbusFactory()
-{
-    CAmDltWrapper::instance()->registerContext(commandDbus, "DBP", "DBus Plugin");
-    return (new CAmCommandSenderDbus());
-}
-
-/**
- * destroy instance of commandSendInterface
- */
-extern "C" void destroyRoutingPluginInterfaceDbus(IAmCommandSend* commandSendInterface)
-{
-    delete commandSendInterface;
-}
-
-CAmCommandSenderDbus::CAmCommandSenderDbus() :
-        mCAmDbusMessageHandler(), //
-        mIAmCommandReceiverShadow(), //
-        mpCAmDbusWrapper(NULL), //
-        mpIAmCommandReceive(NULL), //
-        mReady(false)
-{
-    log(&commandDbus, DLT_LOG_INFO, "DbusCommandSender constructor called");
-}
-
-CAmCommandSenderDbus::~CAmCommandSenderDbus()
-{
-    log(&commandDbus, DLT_LOG_INFO, "DbusCommandSender destructed");
-    CAmDltWrapper::instance()->unregisterContext(commandDbus);
-}
-
-am_Error_e CAmCommandSenderDbus::startupInterface(IAmCommandReceive* commandreceiveinterface)
-{
-    log(&commandDbus, DLT_LOG_INFO, "startupInterface called");
-
-    mpIAmCommandReceive = commandreceiveinterface;
-    mIAmCommandReceiverShadow.setCommandReceiver(mpIAmCommandReceive);
-    mpIAmCommandReceive->getDBusConnectionWrapper(mpCAmDbusWrapper);
-    assert(mpCAmDbusWrapper!=NULL);
-    DBusConnection * connection;
-    mpCAmDbusWrapper->getDBusConnection(connection);
-    assert(connection!=NULL);
-    mCAmDbusMessageHandler.setDBusConnection(connection);
-    return (E_OK);
-}
-
-void CAmCommandSenderDbus::setCommandReady(const uint16_t handle)
-{
-    //todo:implement handle handling
-    log(&commandDbus, DLT_LOG_INFO, "cbCommunicationReady called");
-    mReady = true;
-    mpIAmCommandReceive->confirmCommandReady(handle,E_OK);
-}
-
-void CAmCommandSenderDbus::setCommandRundown(const uint16_t handle)
-{
-    log(&commandDbus, DLT_LOG_INFO, "cbCommunicationRundown called");
-    mReady = false;
-    mpIAmCommandReceive->confirmCommandRundown(handle,E_OK);
-    /**
-     * todo: implement DbusCommandSender::cbCommunicationRundown()
-     */
-}
-
-void CAmCommandSenderDbus::cbNewMainConnection(const am_MainConnectionType_s& mainConnection)
-{
-    (void)mainConnection;
-    //todo: change xml and interface to differetiate between new connection and removed one
-    log(&commandDbus, DLT_LOG_INFO, "cbNumberOfMainConnectionsChanged called");
-
-    if (mReady)
-    {
-        mCAmDbusMessageHandler.initSignal(std::string(MY_NODE), std::string("NumberOfMainConnectionsChanged"));
-        mCAmDbusMessageHandler.sendMessage();
-    }
-}
-
-void CAmCommandSenderDbus::cbRemovedMainConnection(const am_mainConnectionID_t mainConnection)
-{
-    (void)mainConnection;
-//todo: change xml and interface to differetiate between new connection and removed one
-    log(&commandDbus, DLT_LOG_INFO, "cbNumberOfMainConnectionsChanged called");
-
-    if (mReady)
-    {
-        mCAmDbusMessageHandler.initSignal(std::string(MY_NODE), std::string("NumberOfMainConnectionsChanged"));
-        mCAmDbusMessageHandler.sendMessage();
-    }
-}
-
-void CAmCommandSenderDbus::cbNewSink(const am_SinkType_s& sink)
-{
-    log(&commandDbus, DLT_LOG_INFO, "cbNewSink called");
-
-    if (mReady)
-    {
-        mCAmDbusMessageHandler.initSignal(std::string(MY_NODE), "SinkAdded");
-        mCAmDbusMessageHandler.append(sink);
-
-        log(&commandDbus, DLT_LOG_INFO, "send signal SinkAdded");
-        mCAmDbusMessageHandler.sendMessage();
-    }
-}
-
-void CAmCommandSenderDbus::cbRemovedSink(const am_sinkID_t sinkID)
-{
-    //todo: check if this really works!
-    log(&commandDbus, DLT_LOG_INFO, "cbRemovedSink called");
-
-    if (mReady)
-    {
-        mCAmDbusMessageHandler.initSignal(std::string(MY_NODE), "SinkRemoved");
-        mCAmDbusMessageHandler.append(sinkID);
-
-        log(&commandDbus, DLT_LOG_INFO, "send signal SinkRemoved");
-        mCAmDbusMessageHandler.sendMessage();
-    }
-}
-
-void CAmCommandSenderDbus::cbNewSource(const am_SourceType_s& source)
-{
-    log(&commandDbus, DLT_LOG_INFO, "cbNewSource called");
-
-    if (mReady)
-    {
-        mCAmDbusMessageHandler.initSignal(std::string(MY_NODE), "SourceAdded");
-        mCAmDbusMessageHandler.append(source);
-
-        log(&commandDbus, DLT_LOG_INFO, "send signal SourceAdded");
-        mCAmDbusMessageHandler.sendMessage();
-    }
-}
-
-void am::CAmCommandSenderDbus::cbRemovedSource(const am_sourceID_t source)
-{
-    if (mReady)
-    {
-        mCAmDbusMessageHandler.initSignal(std::string(MY_NODE), "SourceRemoved");
-        mCAmDbusMessageHandler.append(source);
-
-        log(&commandDbus, DLT_LOG_INFO, "send signal SourceRemoved");
-
-        mCAmDbusMessageHandler.sendMessage();
-    }
-}
-
-void CAmCommandSenderDbus::cbNumberOfSinkClassesChanged()
-{
-    log(&commandDbus, DLT_LOG_INFO, "cbNumberOfSinkClassesChanged called");
-
-    if (mReady)
-    {
-        mCAmDbusMessageHandler.initSignal(std::string(MY_NODE), std::string("NumberOfSinkClassesChanged"));
-        mCAmDbusMessageHandler.sendMessage();
-    }
-}
-
-void CAmCommandSenderDbus::cbNumberOfSourceClassesChanged()
-{
-    log(&commandDbus, DLT_LOG_INFO, "cbNumberOfSourceClassesChanged called");
-
-    if (mReady)
-    {
-        mCAmDbusMessageHandler.initSignal(std::string(MY_NODE), std::string("NumberOfSourceClassesChanged"));
-        mCAmDbusMessageHandler.sendMessage();
-    }
-}
-
-void CAmCommandSenderDbus::cbMainConnectionStateChanged(const am_mainConnectionID_t connectionID, const am_ConnectionState_e connectionState)
-{
-    log(&commandDbus, DLT_LOG_INFO, "cbMainConnectionStateChanged called, connectionID=", connectionID, "connectionState=", connectionState);
-
-    if (mReady)
-    {
-        mCAmDbusMessageHandler.initSignal(std::string(MY_NODE), std::string("MainConnectionStateChanged"));
-        mCAmDbusMessageHandler.append((dbus_uint16_t) connectionID);
-        mCAmDbusMessageHandler.append((dbus_int16_t) connectionState);
-        mCAmDbusMessageHandler.sendMessage();
-    }
-}
-
-void CAmCommandSenderDbus::cbMainSinkSoundPropertyChanged(const am_sinkID_t sinkID, const am_MainSoundProperty_s & soundProperty)
-{
-    log(&commandDbus, DLT_LOG_INFO, "cbMainSinkSoundPropertyChanged called, sinkID", sinkID, "SoundProperty.type", soundProperty.type, "SoundProperty.value", soundProperty.value);
-
-    if (mReady)
-    {
-        mCAmDbusMessageHandler.initSignal(std::string(MY_NODE), std::string("MainSinkSoundPropertyChanged"));
-        mCAmDbusMessageHandler.append((dbus_uint16_t) sinkID);
-        mCAmDbusMessageHandler.append(soundProperty);
-        mCAmDbusMessageHandler.sendMessage();
-    }
-}
-
-void CAmCommandSenderDbus::cbMainSourceSoundPropertyChanged(const am_sourceID_t sourceID, const am_MainSoundProperty_s & SoundProperty)
-{
-    log(&commandDbus, DLT_LOG_INFO, "cbMainSourceSoundPropertyChanged called, sourceID", sourceID, "SoundProperty.type", SoundProperty.type, "SoundProperty.value", SoundProperty.value);
-
-    if (mReady)
-    {
-        mCAmDbusMessageHandler.initSignal(std::string(MY_NODE), std::string("MainSourceSoundPropertyChanged"));
-        mCAmDbusMessageHandler.append((dbus_uint16_t) sourceID);
-        mCAmDbusMessageHandler.append(SoundProperty);
-        mCAmDbusMessageHandler.sendMessage();
-    }
-}
-
-void CAmCommandSenderDbus::cbSinkAvailabilityChanged(const am_sinkID_t sinkID, const am_Availability_s & availability)
-{
-    log(&commandDbus, DLT_LOG_INFO, "cbSinkAvailabilityChanged called, sinkID", sinkID, "availability.availability", availability.availability, "SoundProperty.reason", availability.availabilityReason);
-
-    if (mReady)
-    {
-        mCAmDbusMessageHandler.initSignal(std::string(MY_NODE), std::string("SinkAvailabilityChanged"));
-        mCAmDbusMessageHandler.append((dbus_uint16_t) sinkID);
-        mCAmDbusMessageHandler.append(availability);
-        mCAmDbusMessageHandler.sendMessage();
-    }
-}
-
-void CAmCommandSenderDbus::cbSourceAvailabilityChanged(const am_sourceID_t sourceID, const am_Availability_s & availability)
-{
-    log(&commandDbus, DLT_LOG_INFO, "cbSourceAvailabilityChanged called, sourceID", sourceID, "availability.availability", availability.availability, "SoundProperty.reason", availability.availabilityReason);
-
-    if (mReady)
-    {
-        mCAmDbusMessageHandler.initSignal(std::string(MY_NODE), std::string("SourceAvailabilityChanged"));
-        mCAmDbusMessageHandler.append((dbus_uint16_t) sourceID);
-        mCAmDbusMessageHandler.append(availability);
-        mCAmDbusMessageHandler.sendMessage();
-    }
-}
-
-void CAmCommandSenderDbus::cbVolumeChanged(const am_sinkID_t sinkID, const am_mainVolume_t volume)
-{
-    log(&commandDbus, DLT_LOG_INFO, "cbVolumeChanged called, sinkID", sinkID, "volume", volume);
-
-    if (mReady)
-    {
-        mCAmDbusMessageHandler.initSignal(std::string(MY_NODE), std::string("VolumeChanged"));
-        mCAmDbusMessageHandler.append((dbus_uint16_t) sinkID);
-        mCAmDbusMessageHandler.append((dbus_int16_t) volume);
-        mCAmDbusMessageHandler.sendMessage();
-    }
-}
-
-void CAmCommandSenderDbus::cbSinkMuteStateChanged(const am_sinkID_t sinkID, const am_MuteState_e muteState)
-{
-    log(&commandDbus, DLT_LOG_INFO, "cbSinkMuteStateChanged called, sinkID", sinkID, "muteState", muteState);
-
-    if (mReady)
-    {
-        mCAmDbusMessageHandler.initSignal(std::string(MY_NODE), std::string("SinkMuteStateChanged"));
-        mCAmDbusMessageHandler.append((dbus_uint16_t) sinkID);
-        mCAmDbusMessageHandler.append((dbus_int16_t) muteState);
-        mCAmDbusMessageHandler.sendMessage();
-    }
-}
-
-void CAmCommandSenderDbus::cbSystemPropertyChanged(const am_SystemProperty_s & SystemProperty)
-{
-    log(&commandDbus, DLT_LOG_INFO, "cbSystemPropertyChanged called, SystemProperty.type", SystemProperty.type, "SystemProperty.value", SystemProperty.value);
-
-    if (mReady)
-    {
-        mCAmDbusMessageHandler.initSignal(std::string(MY_NODE), std::string("SystemPropertyChanged"));
-        mCAmDbusMessageHandler.append(SystemProperty);
-        mCAmDbusMessageHandler.sendMessage();
-    }
-}
-
-void am::CAmCommandSenderDbus::cbTimingInformationChanged(const am_mainConnectionID_t mainConnectionID, const am_timeSync_t time)
-{
-    log(&commandDbus, DLT_LOG_INFO, "cbTimingInformationChanged called, mainConnectionID=", mainConnectionID, "time=", time);
-
-    if (mReady)
-    {
-        mCAmDbusMessageHandler.initSignal(std::string(MY_NODE), std::string("TimingInformationChanged"));
-        mCAmDbusMessageHandler.append((dbus_uint16_t) mainConnectionID);
-        mCAmDbusMessageHandler.append((dbus_int16_t) time);
-        mCAmDbusMessageHandler.sendMessage();
-    }
-}
-
-void CAmCommandSenderDbus::getInterfaceVersion(std::string & version) const
-{
-    version = CommandSendVersion;
-}
-
-void am::CAmCommandSenderDbus::cbSinkUpdated(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties)
-{
-    log(&commandDbus, DLT_LOG_INFO, "cbSinkUpdated called, sinkID", sinkID);
-
-    if (mReady)
-    {
-        mCAmDbusMessageHandler.initSignal(std::string(MY_NODE), std::string("SinkUpdated"));
-        mCAmDbusMessageHandler.append(static_cast<dbus_uint16_t>(sinkID));
-        mCAmDbusMessageHandler.append(static_cast<dbus_uint16_t>(sinkClassID));
-        mCAmDbusMessageHandler.append(listMainSoundProperties);
-        mCAmDbusMessageHandler.sendMessage();
-    }
-}
-
-void am::CAmCommandSenderDbus::cbSourceUpdated(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties)
-{
-    log(&commandDbus, DLT_LOG_INFO, "cbSourceUpdated called, sourceID", sourceID);
-
-    if (mReady)
-    {
-        mCAmDbusMessageHandler.initSignal(std::string(MY_NODE), std::string("SinkUpdated"));
-        mCAmDbusMessageHandler.append(static_cast<dbus_uint16_t>(sourceID));
-        mCAmDbusMessageHandler.append(static_cast<dbus_uint16_t>(sourceClassID));
-        mCAmDbusMessageHandler.append(listMainSoundProperties);
-        mCAmDbusMessageHandler.sendMessage();
-    }
-}
-
-void am::CAmCommandSenderDbus::cbSinkNotification(const am_sinkID_t sinkID, const am_NotificationPayload_s& notification)
-{
-    log(&commandDbus, DLT_LOG_INFO, "cbSinkNotification called, sinkID", sinkID);
-
-    if (mReady)
-    {
-        mCAmDbusMessageHandler.initSignal(std::string(MY_NODE), std::string("SinkNotification"));
-        mCAmDbusMessageHandler.append(static_cast<dbus_uint16_t>(sinkID));
-        mCAmDbusMessageHandler.append(notification);
-        mCAmDbusMessageHandler.sendMessage();
-    }
-}
-
-void am::CAmCommandSenderDbus::cbSourceNotification(const am_sourceID_t sourceID, const am_NotificationPayload_s& notification)
-{
-    log(&commandDbus, DLT_LOG_INFO, "cbSourceNotification called, sourceID", sourceID);
-
-    if (mReady)
-    {
-        mCAmDbusMessageHandler.initSignal(std::string(MY_NODE), std::string("SourceNotification"));
-        mCAmDbusMessageHandler.append(static_cast<dbus_uint16_t>(sourceID));
-        mCAmDbusMessageHandler.append(notification);
-        mCAmDbusMessageHandler.sendMessage();
-    }
-}
-
-void am::CAmCommandSenderDbus::cbMainSinkNotificationConfigurationChanged(const am_sinkID_t sinkID, const am_NotificationConfiguration_s& mainNotificationConfiguration)
-{
-    log(&commandDbus, DLT_LOG_INFO, "cbSinkMainNotificationConfigurationChanged called, sinkID", sinkID);
-
-    if (mReady)
-    {
-        mCAmDbusMessageHandler.initSignal(std::string(MY_NODE), std::string("SinkMainNotificationConfigurationChanged"));
-        mCAmDbusMessageHandler.append(static_cast<dbus_uint16_t>(sinkID));
-        mCAmDbusMessageHandler.append(mainNotificationConfiguration);
-        mCAmDbusMessageHandler.sendMessage();
-    }
-}
-
-void am::CAmCommandSenderDbus::cbMainSourceNotificationConfigurationChanged(const am_sourceID_t sourceID, const am_NotificationConfiguration_s& mainNotificationConfiguration)
-{
-    log(&commandDbus, DLT_LOG_INFO, "cbSourceMainNotificationConfigurationChanged called, sourceID", sourceID);
-
-    if (mReady)
-    {
-        mCAmDbusMessageHandler.initSignal(std::string(MY_NODE), std::string("SinkMainNotificationConfigurationChanged"));
-        mCAmDbusMessageHandler.append(static_cast<dbus_uint16_t>(sourceID));
-        mCAmDbusMessageHandler.append(mainNotificationConfiguration);
-        mCAmDbusMessageHandler.sendMessage();
-    }
-}
diff --git a/PluginCommandInterfaceDbus/src/CAmDbusMessageHandler.cpp b/PluginCommandInterfaceDbus/src/CAmDbusMessageHandler.cpp
deleted file mode 100644
index 491239a..0000000
--- a/PluginCommandInterfaceDbus/src/CAmDbusMessageHandler.cpp
+++ /dev/null
@@ -1,709 +0,0 @@
-/**
- *  Copyright (c) 2012 BMW
- *
- *  \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012
- *
- *  \copyright
- *  Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction,
- *  including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
- *  subject to the following conditions:
- *  The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- *  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- *  THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- *  For further information see http://www.genivi.org/.
- */
-
-#include "CAmDbusMessageHandler.h"
-#include "config.h"
-#include <cstdlib>
-#include <cassert>
-#include <vector>
-#include "CAmCommandSenderDbus.h"
-#include "shared/CAmDltWrapper.h"
-
-DLT_IMPORT_CONTEXT(commandDbus)
-
-namespace am
-{
-
-CAmDbusMessageHandler::CAmDbusMessageHandler() :
-        mDBusMessageIter(), //
-        mDBusError(), //
-        mSerial(0), //
-        mErrorName(""), //
-        mErrorMsg(""), //
-        mpDBusMessage(NULL), //
-        mpReveiveMessage(NULL), //
-        mpDBusConnection(NULL)
-{
-   // CAmDltWrapper::instance()->registerContext(commandDbus, "DBP", "DBus Plugin");
-    log(&commandDbus, DLT_LOG_INFO, "DBusMessageHandler constructed");
-}
-
-CAmDbusMessageHandler::~CAmDbusMessageHandler()
-{
-    log(&commandDbus, DLT_LOG_INFO, "DBUSMessageHandler destructed");
-}
-
-void CAmDbusMessageHandler::initReceive(DBusMessage* msg)
-{
-    assert(msg!=NULL);
-    mpReveiveMessage = msg;
-    if (!dbus_message_iter_init(msg, &mDBusMessageIter))
-    {
-        log(&commandDbus, DLT_LOG_INFO, "DBusMessageHandler::initReceive DBus Message has no arguments!");
-        mErrorName = std::string(DBUS_ERROR_INVALID_ARGS);
-        mErrorMsg = "DBUS Message has no arguments!";
-    }
-}
-
-void CAmDbusMessageHandler::initReply(DBusMessage* msg)
-{
-    assert(msg!=NULL);
-    mpDBusMessage = dbus_message_new_method_return(msg);
-    if (mpDBusMessage == NULL)
-    {
-        log(&commandDbus, DLT_LOG_ERROR, "DBusMessageHandler::initReply Cannot allocate DBus message!");
-        mErrorName = std::string(DBUS_ERROR_NO_MEMORY);
-        mErrorMsg = "Cannot create reply!";
-    }
-    dbus_message_iter_init_append(mpDBusMessage, &mDBusMessageIter);
-}
-
-void CAmDbusMessageHandler::initSignal(std::string path, std::string signalName)
-{
-    assert(!path.empty());
-    assert(!signalName.empty());
-    std::string completePath = std::string(DBUS_SERVICE_OBJECT_PATH) + "/" + path;
-	std::string completeInterface = std::string(DBUS_SERVICE_PREFIX) + "." + MY_NODE;
-    mpDBusMessage = dbus_message_new_signal(completePath.c_str(), completeInterface.c_str(), signalName.c_str());
-
-    if (mpDBusMessage == NULL)
-    {
-        log(&commandDbus, DLT_LOG_ERROR, "DBusMessageHandler::initSignal Cannot allocate DBus message!");
-    }
-    dbus_message_iter_init_append(mpDBusMessage, &mDBusMessageIter);
-}
-
-void CAmDbusMessageHandler::sendMessage()
-{
-    assert(mpDBusConnection!=NULL);
-    if (mpReveiveMessage != 0)
-    {
-        mSerial = dbus_message_get_serial(mpReveiveMessage);
-    }
-    else
-    {
-        mSerial = 1;
-    }
-    if (!mErrorName.empty())
-    {
-        mpDBusMessage = dbus_message_new_error(mpReveiveMessage, mErrorName.c_str(), mErrorMsg.c_str());
-    }
-    if (!dbus_connection_send(mpDBusConnection, mpDBusMessage, &mSerial))
-    {
-        log(&commandDbus, DLT_LOG_ERROR, "DBusMessageHandler::sendMessage cannot send message!");
-    }
-    dbus_connection_flush(mpDBusConnection);
-    dbus_message_unref(mpDBusMessage);
-    mpDBusMessage = NULL;
-    mpReveiveMessage = NULL;
-}
-
-char* CAmDbusMessageHandler::getString()
-{
-    char* param = NULL;
-
-    if (DBUS_TYPE_STRING != dbus_message_iter_get_arg_type(&mDBusMessageIter))
-    {
-        log(&commandDbus, DLT_LOG_ERROR, "DBusMessageHandler::getString DBUS handler argument is no String!");
-        mErrorName = std::string(DBUS_ERROR_INVALID_ARGS);
-        mErrorMsg = "DBus argument is no string";
-    }
-    else
-    {
-        dbus_message_iter_get_basic(&mDBusMessageIter, &param);
-        dbus_message_iter_next(&mDBusMessageIter);
-    }
-    return (param);
-}
-
-dbus_bool_t CAmDbusMessageHandler::getBool()
-{
-    dbus_bool_t boolparam = false;
-
-    if (DBUS_TYPE_BOOLEAN != dbus_message_iter_get_arg_type(&mDBusMessageIter))
-    {
-        log(&commandDbus, DLT_LOG_ERROR, "DBusMessageHandler::getBool DBUS handler argument is no bool!");
-        mErrorName = std::string(DBUS_ERROR_INVALID_ARGS);
-        mErrorMsg = "DBus argument is no bool";
-    }
-    else
-    {
-        dbus_message_iter_get_basic(&mDBusMessageIter, &boolparam);
-        dbus_message_iter_next(&mDBusMessageIter);
-    }
-    return (boolparam);
-}
-
-char CAmDbusMessageHandler::getByte()
-{
-    char param(0);
-
-    if (DBUS_TYPE_BYTE != dbus_message_iter_get_arg_type(&mDBusMessageIter))
-    {
-        log(&commandDbus, DLT_LOG_ERROR, "DBusMessageHandler::getByte DBUS handler argument is no byte!");
-        mErrorName = std::string(DBUS_ERROR_INVALID_ARGS);
-        mErrorMsg = "DBus argument is no byte";
-    }
-    else
-    {
-        dbus_message_iter_get_basic(&mDBusMessageIter, &param);
-        dbus_message_iter_next(&mDBusMessageIter);
-    }
-    return (param);
-}
-
-dbus_uint16_t CAmDbusMessageHandler::getUInt()
-{
-    dbus_uint16_t param(0);
-
-#ifdef GLIB_DBUS_TYPES_TOLERANT
-    if (DBUS_TYPE_UINT16 != dbus_message_iter_get_arg_type(&mDBusMessageIter) && DBUS_TYPE_UINT32 != dbus_message_iter_get_arg_type(&mDBusMessageIter))
-#else
-    if (DBUS_TYPE_UINT16 != dbus_message_iter_get_arg_type(&mDBusMessageIter))
-#endif
-    {
-        log(&commandDbus, DLT_LOG_ERROR, "DBusMessageHandler::getUInt DBUS handler argument is no uint16_t!");
-        mErrorName = std::string(DBUS_ERROR_INVALID_ARGS);
-        mErrorMsg = "DBus argument is no uint16_t";
-    }
-    else
-    {
-        dbus_message_iter_get_basic(&mDBusMessageIter, &param);
-        dbus_message_iter_next(&mDBusMessageIter);
-    }
-    return (param);
-}
-
-dbus_int16_t CAmDbusMessageHandler::getInt()
-{
-    dbus_int16_t param(0);
-
-#ifdef GLIB_DBUS_TYPES_TOLERANT
-    if (DBUS_TYPE_INT16 != dbus_message_iter_get_arg_type(&mDBusMessageIter) && DBUS_TYPE_INT32 != dbus_message_iter_get_arg_type(&mDBusMessageIter))
-#else
-    if (DBUS_TYPE_INT16 != dbus_message_iter_get_arg_type(&mDBusMessageIter))
-#endif
-    {
-        log(&commandDbus, DLT_LOG_ERROR, "DBusMessageHandler::getInt DBUS handler argument is no int16_t!");
-        mErrorName = std::string(DBUS_ERROR_INVALID_ARGS);
-        mErrorMsg = "DBus argument is no int16_t";
-    }
-    else
-    {
-        dbus_message_iter_get_basic(&mDBusMessageIter, &param);
-        dbus_message_iter_next(&mDBusMessageIter);
-    }
-    return (param);
-}
-
-double CAmDbusMessageHandler::getDouble()
-{
-    double param(0);
-    if (DBUS_TYPE_DOUBLE != dbus_message_iter_get_arg_type(&mDBusMessageIter))
-    {
-        log(&commandDbus, DLT_LOG_ERROR, "DBusMessageHandler::getDouble DBUS handler argument is no double!");
-        mErrorName = std::string(DBUS_ERROR_INVALID_ARGS);
-        mErrorMsg = "DBus argument is no double";
-    }
-    else
-    {
-        dbus_message_iter_get_basic(&mDBusMessageIter, &param);
-        dbus_message_iter_next(&mDBusMessageIter);
-    }
-    return (param);
-}
-
-void CAmDbusMessageHandler::getProperty(dbus_int16_t & type, dbus_int16_t & value)
-{
-    DBusMessageIter arrayIter;
-    if (DBUS_TYPE_STRUCT != dbus_message_iter_get_arg_type(&mDBusMessageIter))
-    {
-        log(&commandDbus, DLT_LOG_ERROR, "DBusMessageHandler::getProperty DBUS handler argument is no array!");
-        mErrorName = std::string(DBUS_ERROR_INVALID_ARGS);
-        mErrorMsg = "DBus argument is no array";
-    }
-    else
-    {
-        dbus_message_iter_recurse(&mDBusMessageIter, &arrayIter);
-        dbus_message_iter_get_basic(&arrayIter, &type);
-        dbus_message_iter_next(&arrayIter);
-        dbus_message_iter_get_basic(&arrayIter, &value);
-        dbus_message_iter_next(&mDBusMessageIter);
-    }
-}
-
-void CAmDbusMessageHandler::append(bool toAppend)
-{
-    dbus_bool_t mybool = toAppend;
-    if (!dbus_message_iter_append_basic(&mDBusMessageIter, DBUS_TYPE_BOOLEAN, &mybool))
-    {
-        log(&commandDbus, DLT_LOG_ERROR, "DBusMessageHandler::append Cannot allocate DBus message!");
-        mErrorName = std::string(DBUS_ERROR_NO_MEMORY);
-        mErrorMsg = "Cannot create reply!";
-    }
-}
-
-void CAmDbusMessageHandler::append(double toAppend)
-{
-    if (!dbus_message_iter_append_basic(&mDBusMessageIter, DBUS_TYPE_DOUBLE, &toAppend))
-    {
-        log(&commandDbus, DLT_LOG_ERROR, "DBusMessageHandler::append Cannot allocate DBus message!");
-        mErrorName = std::string(DBUS_ERROR_NO_MEMORY);
-        mErrorMsg = "Cannot create reply!";
-    }
-}
-
-void CAmDbusMessageHandler::append(char toAppend)
-{
-    if (!dbus_message_iter_append_basic(&mDBusMessageIter, DBUS_TYPE_BYTE, &toAppend))
-    {
-        log(&commandDbus, DLT_LOG_ERROR, "DBusMessageHandler::append Cannot allocate DBus message!");
-        mErrorName = std::string(DBUS_ERROR_NO_MEMORY);
-        mErrorMsg = "Cannot create reply!";
-    }
-}
-
-void CAmDbusMessageHandler::append(dbus_int16_t toAppend)
-{
-    if (!dbus_message_iter_append_basic(&mDBusMessageIter, DBUS_TYPE_INT16, &toAppend))
-    {
-        log(&commandDbus, DLT_LOG_ERROR, "DBusMessageHandler::append Cannot allocate DBus message!");
-        mErrorName = std::string(DBUS_ERROR_NO_MEMORY);
-        mErrorMsg = "Cannot create reply!";
-    }
-}
-
-void CAmDbusMessageHandler::append(dbus_uint16_t toAppend)
-{
-    if (!dbus_message_iter_append_basic(&mDBusMessageIter, DBUS_TYPE_UINT16, &toAppend))
-    {
-        log(&commandDbus, DLT_LOG_ERROR, "DBusMessageHandler::append Cannot allocate DBus message!");
-        mErrorName = std::string(DBUS_ERROR_NO_MEMORY);
-        mErrorMsg = "Cannot create reply!";
-    }
-}
-
-void CAmDbusMessageHandler::setDBusConnection(DBusConnection *& connection)
-{
-    assert(connection!=NULL);
-    mpDBusConnection = connection;
-}
-
-void CAmDbusMessageHandler::append(const am::am_SinkType_s& sinkType)
-{
-    DBusMessageIter structIter;
-    DBusMessageIter structAvailIter;
-    dbus_bool_t success = true;
-    success = success && dbus_message_iter_open_container(&mDBusMessageIter, DBUS_TYPE_STRUCT, NULL, &structIter);
-    success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_UINT16, &sinkType.sinkID);
-    success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_STRING, &sinkType.name);
-
-    success = success && dbus_message_iter_open_container(&structIter, DBUS_TYPE_STRUCT, NULL, &structAvailIter);
-    success = success && dbus_message_iter_append_basic(&structAvailIter, DBUS_TYPE_INT16, &sinkType.availability.availability);
-    success = success && dbus_message_iter_append_basic(&structAvailIter, DBUS_TYPE_INT16, &sinkType.availability.availabilityReason);
-    success = success && dbus_message_iter_close_container(&structIter, &structAvailIter);
-
-    success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_INT16, &sinkType.volume);
-    success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_INT16, &sinkType.muteState);
-    success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_UINT16, &sinkType.sinkClassID);
-    success = success && dbus_message_iter_close_container(&mDBusMessageIter, &structIter);
-
-    if (!success)
-    {
-        log(&commandDbus, DLT_LOG_ERROR, "DBusMessageHandler::append Cannot allocate DBus message!");
-        mErrorName = std::string(DBUS_ERROR_NO_MEMORY);
-        mErrorMsg = "Cannot create reply!";
-    }
-}
-
-void CAmDbusMessageHandler::append(const am::am_SourceType_s & sourceType)
-{
-    DBusMessageIter structIter;
-    DBusMessageIter structAvailIter;
-    dbus_bool_t success = true;
-    success = success && dbus_message_iter_open_container(&mDBusMessageIter, DBUS_TYPE_STRUCT, NULL, &structIter);
-    success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_UINT16, &sourceType.sourceID);
-    success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_STRING, &sourceType.name);
-
-    success = success && dbus_message_iter_open_container(&structIter, DBUS_TYPE_STRUCT, NULL, &structAvailIter);
-    success = success && dbus_message_iter_append_basic(&structAvailIter, DBUS_TYPE_INT16, &sourceType.availability.availability);
-    success = success && dbus_message_iter_append_basic(&structAvailIter, DBUS_TYPE_INT16, &sourceType.availability.availabilityReason);
-    success = success && dbus_message_iter_close_container(&structIter, &structAvailIter);
-
-    success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_UINT16, &sourceType.sourceClassID);
-    success = success && dbus_message_iter_close_container(&mDBusMessageIter, &structIter);
-
-    if (!success)
-    {
-        log(&commandDbus, DLT_LOG_ERROR, "DBusMessageHandler::append Cannot allocate DBus message!");
-        mErrorName = std::string(DBUS_ERROR_NO_MEMORY);
-        mErrorMsg = "Cannot create reply!";
-    }
-}
-
-void CAmDbusMessageHandler::append(const am::am_MainSoundProperty_s mainSoundProperty)
-{
-    DBusMessageIter structIter;
-    dbus_bool_t success = true;
-    success = success && dbus_message_iter_open_container(&mDBusMessageIter, DBUS_TYPE_STRUCT, NULL, &structIter);
-    success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_INT16, &mainSoundProperty.type);
-    success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_INT16, &mainSoundProperty.value);
-    success = success && dbus_message_iter_close_container(&mDBusMessageIter, &structIter);
-
-    if (!success)
-    {
-        log(&commandDbus, DLT_LOG_ERROR, "DBusMessageHandler::append Cannot allocate DBus message!");
-        mErrorName = std::string(DBUS_ERROR_NO_MEMORY);
-        mErrorMsg = "Cannot create reply!";
-    }
-}
-
-void CAmDbusMessageHandler::append(const am::am_Availability_s & availability)
-{
-    DBusMessageIter structAvailIter;
-    dbus_bool_t success = true;
-    success = success && dbus_message_iter_open_container(&mDBusMessageIter, DBUS_TYPE_STRUCT, NULL, &structAvailIter);
-    success = success && dbus_message_iter_append_basic(&structAvailIter, DBUS_TYPE_INT16, &availability.availability);
-    success = success && dbus_message_iter_append_basic(&structAvailIter, DBUS_TYPE_INT16, &availability.availabilityReason);
-    success = success && dbus_message_iter_close_container(&mDBusMessageIter, &structAvailIter);
-
-    if (!success)
-    {
-        log(&commandDbus, DLT_LOG_ERROR, "DBusMessageHandler::append Cannot allocate DBus message!");
-        mErrorName = std::string(DBUS_ERROR_NO_MEMORY);
-        mErrorMsg = "Cannot create reply!";
-    }
-}
-
-void CAmDbusMessageHandler::append(const am::am_SystemProperty_s & SystemProperty)
-{
-    DBusMessageIter structIter;
-    dbus_bool_t success = true;
-    success = success && dbus_message_iter_open_container(&mDBusMessageIter, DBUS_TYPE_STRUCT, NULL, &structIter);
-    success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_INT16, &SystemProperty.type);
-    success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_INT16, &SystemProperty.value);
-    success = success && dbus_message_iter_close_container(&mDBusMessageIter, &structIter);
-
-    if (!success)
-    {
-        log(&commandDbus, DLT_LOG_ERROR, "DBusMessageHandler::append Cannot allocate DBus message!");
-        mErrorName = std::string(DBUS_ERROR_NO_MEMORY);
-        mErrorMsg = "Cannot create reply!";
-    }
-}
-
-void CAmDbusMessageHandler::append(const std::vector<am::am_MainConnectionType_s>& listMainConnections)
-{
-    DBusMessageIter arrayIter;
-    DBusMessageIter structIter;
-    std::vector<am::am_MainConnectionType_s>::const_iterator listIterator = listMainConnections.begin();
-    dbus_bool_t success = true;
-
-    success = success && dbus_message_iter_open_container(&mDBusMessageIter, DBUS_TYPE_ARRAY, "(qqqnn)", &arrayIter);
-    for (; listIterator < listMainConnections.end(); ++listIterator)
-    {
-        success = success && dbus_message_iter_open_container(&arrayIter, DBUS_TYPE_STRUCT, NULL, &structIter);
-        success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_UINT16, &listIterator->mainConnectionID);
-        success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_UINT16, &listIterator->sourceID);
-        success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_UINT16, &listIterator->sinkID);
-        success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_INT16, &listIterator->delay);
-        success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_INT16, &listIterator->connectionState);
-        success = success && dbus_message_iter_close_container(&arrayIter, &structIter);
-    }
-    success = success && dbus_message_iter_close_container(&mDBusMessageIter, &arrayIter);
-
-    if (!success)
-    {
-        log(&commandDbus, DLT_LOG_ERROR, "DBusMessageHandler::append Cannot allocate DBus message!");
-        mErrorName = std::string(DBUS_ERROR_NO_MEMORY);
-        mErrorMsg = "Cannot create reply!";
-    }
-}
-
-void CAmDbusMessageHandler::append(const std::vector<am::am_SinkType_s> & listMainSinks)
-{
-    DBusMessageIter arrayIter;
-    DBusMessageIter structIter;
-    DBusMessageIter availIter;
-    std::vector<am::am_SinkType_s>::const_iterator listIterator = listMainSinks.begin();
-    dbus_bool_t success = true;
-
-    success = success && dbus_message_iter_open_container(&mDBusMessageIter, DBUS_TYPE_ARRAY, "(qs(nn)nnq)", &arrayIter);
-    for (; listIterator < listMainSinks.end(); ++listIterator)
-    {
-        success = success && dbus_message_iter_open_container(&arrayIter, DBUS_TYPE_STRUCT, NULL, &structIter);
-        success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_UINT16, &listIterator->sinkID);
-        success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_STRING, &listIterator->name);
-        success = success && dbus_message_iter_open_container(&structIter, DBUS_TYPE_STRUCT, NULL, &availIter);
-        success = success && dbus_message_iter_append_basic(&availIter, DBUS_TYPE_INT16, &listIterator->availability.availability);
-        success = success && dbus_message_iter_append_basic(&availIter, DBUS_TYPE_INT16, &listIterator->availability.availabilityReason);
-        success = success && dbus_message_iter_close_container(&structIter, &availIter);
-        success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_INT16, &listIterator->volume);
-        success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_INT16, &listIterator->muteState);
-        success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_UINT16, &listIterator->sinkClassID);
-        success = success && dbus_message_iter_close_container(&arrayIter, &structIter);
-    }
-    success = success && dbus_message_iter_close_container(&mDBusMessageIter, &arrayIter);
-
-    if (!success)
-    {
-        log(&commandDbus, DLT_LOG_ERROR, "DBusMessageHandler::append Cannot allocate DBus message!");
-        mErrorName = std::string(DBUS_ERROR_NO_MEMORY);
-        mErrorMsg = "Cannot create reply!";
-    }
-}
-
-void CAmDbusMessageHandler::append(const std::vector<am::am_SourceType_s> & listMainSources)
-{
-    DBusMessageIter arrayIter;
-    DBusMessageIter structIter;
-    DBusMessageIter availIter;
-    std::vector<am::am_SourceType_s>::const_iterator listIterator = listMainSources.begin();
-    dbus_bool_t success = true;
-
-    success = success && dbus_message_iter_open_container(&mDBusMessageIter, DBUS_TYPE_ARRAY, "(qs(nn)q)", &arrayIter);
-    for (; listIterator < listMainSources.end(); ++listIterator)
-    {
-        success = success && dbus_message_iter_open_container(&arrayIter, DBUS_TYPE_STRUCT, NULL, &structIter);
-        success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_UINT16, &listIterator->sourceID);
-        success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_STRING, &listIterator->name);
-        success = success && dbus_message_iter_open_container(&structIter, DBUS_TYPE_STRUCT, NULL, &availIter);
-        success = success && dbus_message_iter_append_basic(&availIter, DBUS_TYPE_INT16, &listIterator->availability.availability);
-        success = success && dbus_message_iter_append_basic(&availIter, DBUS_TYPE_INT16, &listIterator->availability.availabilityReason);
-        success = success && dbus_message_iter_close_container(&structIter, &availIter);
-        success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_UINT16, &listIterator->sourceClassID);
-        success = success && dbus_message_iter_close_container(&arrayIter, &structIter);
-    }
-    success = success && dbus_message_iter_close_container(&mDBusMessageIter, &arrayIter);
-
-    if (!success)
-    {
-        log(&commandDbus, DLT_LOG_ERROR, "DBusMessageHandler::append Cannot allocate DBus message!");
-        mErrorName = std::string(DBUS_ERROR_NO_MEMORY);
-        mErrorMsg = "Cannot create reply!";
-    }
-}
-
-void CAmDbusMessageHandler::append(const std::vector<am::am_MainSoundProperty_s> & listMainSoundProperties)
-{
-    DBusMessageIter arrayIter;
-    DBusMessageIter structIter;
-    std::vector<am::am_MainSoundProperty_s>::const_iterator listIterator = listMainSoundProperties.begin();
-    dbus_bool_t success = true;
-
-    success = success && dbus_message_iter_open_container(&mDBusMessageIter, DBUS_TYPE_ARRAY, "(nn)", &arrayIter);
-    for (; listIterator < listMainSoundProperties.end(); ++listIterator)
-    {
-        success = success && dbus_message_iter_open_container(&arrayIter, DBUS_TYPE_STRUCT, NULL, &structIter);
-        success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_INT16, &listIterator->type);
-        success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_INT16, &listIterator->value);
-        success = success && dbus_message_iter_close_container(&arrayIter, &structIter);
-    }
-    success = success && dbus_message_iter_close_container(&mDBusMessageIter, &arrayIter);
-
-    if (!success)
-    {
-        log(&commandDbus, DLT_LOG_ERROR, "DBusMessageHandler::append Cannot allocate DBus message!");
-        mErrorName = std::string(DBUS_ERROR_NO_MEMORY);
-        mErrorMsg = "Cannot create reply!";
-    }
-}
-
-void CAmDbusMessageHandler::append(const std::vector<am::am_SourceClass_s> & listSourceClasses)
-{
-    DBusMessageIter arrayIter;
-    DBusMessageIter structIter;
-    DBusMessageIter propIter;
-    DBusMessageIter innerIter;
-    std::vector<am::am_SourceClass_s>::const_iterator listIterator = listSourceClasses.begin();
-    dbus_bool_t success = true;
-
-    success = success && dbus_message_iter_open_container(&mDBusMessageIter, DBUS_TYPE_ARRAY, "(qsa(nn))", &arrayIter);
-    for (; listIterator < listSourceClasses.end(); ++listIterator)
-    {
-        success = success && dbus_message_iter_open_container(&arrayIter, DBUS_TYPE_STRUCT, NULL, &structIter);
-        success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_UINT16, &listIterator->sourceClassID);
-        success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_STRING, &listIterator->name);
-        success = success && dbus_message_iter_open_container(&structIter, DBUS_TYPE_ARRAY, "(nn)", &innerIter);
-
-        std::vector<am::am_ClassProperty_s>::const_iterator listInnerIterator = listIterator->listClassProperties.begin();
-        for (; listInnerIterator < listIterator->listClassProperties.end(); ++listInnerIterator)
-        {
-            success = success && dbus_message_iter_open_container(&innerIter, DBUS_TYPE_STRUCT, NULL, &propIter);
-            success = success && dbus_message_iter_append_basic(&propIter, DBUS_TYPE_INT16, &listInnerIterator->classProperty);
-            success = success && dbus_message_iter_append_basic(&propIter, DBUS_TYPE_INT16, &listInnerIterator->value);
-            success = success && dbus_message_iter_close_container(&innerIter, &propIter);
-        }
-        success = success && dbus_message_iter_close_container(&structIter, &innerIter);
-        success = success && dbus_message_iter_close_container(&arrayIter, &structIter);
-    }
-    success = success && dbus_message_iter_close_container(&mDBusMessageIter, &arrayIter);
-
-    if (!success)
-    {
-        log(&commandDbus, DLT_LOG_ERROR, "DBusMessageHandler::append Cannot allocate DBus message!");
-        mErrorName = std::string(DBUS_ERROR_NO_MEMORY);
-        mErrorMsg = "Cannot create reply!";
-    }
-}
-
-void CAmDbusMessageHandler::append(const std::vector<am::am_SinkClass_s> & listSinkClasses)
-{
-    DBusMessageIter arrayIter;
-    DBusMessageIter structIter;
-    DBusMessageIter propIter;
-    DBusMessageIter innerIter;
-    std::vector<am::am_SinkClass_s>::const_iterator listIterator = listSinkClasses.begin();
-    dbus_bool_t success = true;
-
-    success = success && dbus_message_iter_open_container(&mDBusMessageIter, DBUS_TYPE_ARRAY, "(qsa(nn))", &arrayIter);
-    for (; listIterator < listSinkClasses.end(); ++listIterator)
-    {
-        success = success && dbus_message_iter_open_container(&arrayIter, DBUS_TYPE_STRUCT, NULL, &structIter);
-        success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_UINT16, &listIterator->sinkClassID);
-        success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_STRING, &listIterator->name);
-        success = success && dbus_message_iter_open_container(&structIter, DBUS_TYPE_ARRAY, "(nn)", &innerIter);
-
-        std::vector<am::am_ClassProperty_s>::const_iterator listInnerIterator = listIterator->listClassProperties.begin();
-        for (; listInnerIterator < listIterator->listClassProperties.end(); ++listInnerIterator)
-        {
-            success = success && dbus_message_iter_open_container(&innerIter, DBUS_TYPE_STRUCT, NULL, &propIter);
-            success = success && dbus_message_iter_append_basic(&propIter, DBUS_TYPE_INT16, &listInnerIterator->classProperty);
-            success = success && dbus_message_iter_append_basic(&propIter, DBUS_TYPE_INT16, &listInnerIterator->value);
-            success = success && dbus_message_iter_close_container(&innerIter, &propIter);
-        }
-        success = success && dbus_message_iter_close_container(&structIter, &innerIter);
-        success = success && dbus_message_iter_close_container(&arrayIter, &structIter);
-    }
-    success = success && dbus_message_iter_close_container(&mDBusMessageIter, &arrayIter);
-
-    if (!success)
-    {
-        log(&commandDbus, DLT_LOG_ERROR, "DBusMessageHandler::append Cannot allocate DBus message!");
-        mErrorName = std::string(DBUS_ERROR_NO_MEMORY);
-        mErrorMsg = "Cannot create reply!";
-    }
-}
-
-void CAmDbusMessageHandler::append(const std::vector<am::am_SystemProperty_s> & listSystemProperties)
-{
-    DBusMessageIter arrayIter;
-    DBusMessageIter structIter;
-    std::vector<am::am_SystemProperty_s>::const_iterator listIterator = listSystemProperties.begin();
-    dbus_bool_t success = true;
-
-    success = success && dbus_message_iter_open_container(&mDBusMessageIter, DBUS_TYPE_ARRAY, "(nn)", &arrayIter);
-    for (; listIterator < listSystemProperties.end(); ++listIterator)
-    {
-        success = success && dbus_message_iter_open_container(&arrayIter, DBUS_TYPE_STRUCT, NULL, &structIter);
-        success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_INT16, &listIterator->type);
-        success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_INT16, &listIterator->value);
-        success = success && dbus_message_iter_close_container(&arrayIter, &structIter);
-    }
-    success = success && dbus_message_iter_close_container(&mDBusMessageIter, &arrayIter);
-
-    if (!success)
-    {
-        log(&commandDbus, DLT_LOG_ERROR, "DBusMessageHandler::append Cannot allocate DBus message!");
-        mErrorName = std::string(DBUS_ERROR_NO_MEMORY);
-        mErrorMsg = "Cannot create reply!";
-    }
-}
-
-void CAmDbusMessageHandler::getNotificationConfiguration(dbus_int16_t& type, dbus_int16_t& status, dbus_int16_t& parameter)
-{
-    DBusMessageIter arrayIter;
-    if (DBUS_TYPE_STRUCT != dbus_message_iter_get_arg_type(&mDBusMessageIter))
-    {
-        log(&commandDbus, DLT_LOG_ERROR, "DBusMessageHandler::getProperty DBUS handler argument is no array!");
-        mErrorName = std::string(DBUS_ERROR_INVALID_ARGS);
-        mErrorMsg = "DBus argument is no array";
-    }
-    else
-    {
-        dbus_message_iter_recurse(&mDBusMessageIter, &arrayIter);
-        dbus_message_iter_get_basic(&arrayIter, &type);
-        dbus_message_iter_next(&arrayIter);
-        dbus_message_iter_get_basic(&arrayIter, &status);
-        dbus_message_iter_next(&arrayIter);
-        dbus_message_iter_get_basic(&arrayIter, &parameter);
-        dbus_message_iter_next(&mDBusMessageIter);
-    }
-}
-
-void CAmDbusMessageHandler::append(const std::vector<am::am_NotificationConfiguration_s>& listNotifications)
-{
-    DBusMessageIter arrayIter;
-    DBusMessageIter structIter;
-    std::vector<am::am_NotificationConfiguration_s>::const_iterator listIterator = listNotifications.begin();
-    dbus_bool_t success = true;
-
-    success = success && dbus_message_iter_open_container(&mDBusMessageIter, DBUS_TYPE_ARRAY, "(nnn)", &arrayIter);
-    for (; listIterator < listNotifications.end(); ++listIterator)
-    {
-        success = success && dbus_message_iter_open_container(&arrayIter, DBUS_TYPE_STRUCT, NULL, &structIter);
-        success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_INT16, &listIterator->type);
-        success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_INT16, &listIterator->status);
-        success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_INT16, &listIterator->parameter);
-        success = success && dbus_message_iter_close_container(&arrayIter, &structIter);
-    }
-    success = success && dbus_message_iter_close_container(&mDBusMessageIter, &arrayIter);
-
-    if (!success)
-    {
-        log(&commandDbus, DLT_LOG_ERROR, "DBusMessageHandler::append Cannot allocate DBus message!");
-        mErrorName = std::string(DBUS_ERROR_NO_MEMORY);
-        mErrorMsg = "Cannot create reply!";
-    }
-}
-
-void CAmDbusMessageHandler::append(const am::am_NotificationPayload_s& notificationPayload)
-{
-    DBusMessageIter structIter;
-    dbus_bool_t success = true;
-    success = success && dbus_message_iter_open_container(&mDBusMessageIter, DBUS_TYPE_STRUCT, NULL, &structIter);
-    success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_INT16, &notificationPayload.type);
-    success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_INT16, &notificationPayload.value);
-    success = success && dbus_message_iter_close_container(&mDBusMessageIter, &structIter);
-
-    if (!success)
-    {
-        log(&commandDbus, DLT_LOG_ERROR, "DBusMessageHandler::append Cannot allocate DBus message!");
-        mErrorName = std::string(DBUS_ERROR_NO_MEMORY);
-        mErrorMsg = "Cannot create reply!";
-    }
-}
-
-void CAmDbusMessageHandler::append(const am::am_NotificationConfiguration_s& notificationConfiguration)
-{
-    DBusMessageIter structIter;
-    dbus_bool_t success = true;
-    success = success && dbus_message_iter_open_container(&mDBusMessageIter, DBUS_TYPE_STRUCT, NULL, &structIter);
-    success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_INT16, &notificationConfiguration.type);
-    success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_INT16, &notificationConfiguration.status);
-    success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_INT16, &notificationConfiguration.parameter);
-    success = success && dbus_message_iter_close_container(&mDBusMessageIter, &structIter);
-
-    if (!success)
-    {
-        log(&commandDbus, DLT_LOG_ERROR, "DBusMessageHandler::append Cannot allocate DBus message!");
-        mErrorName = std::string(DBUS_ERROR_NO_MEMORY);
-        mErrorMsg = "Cannot create reply!";
-    }
-}
-
-}
diff --git a/PluginCommandInterfaceDbus/src/IAmCommandReceiverShadow.cpp b/PluginCommandInterfaceDbus/src/IAmCommandReceiverShadow.cpp
deleted file mode 100644
index 11cacb4..0000000
--- a/PluginCommandInterfaceDbus/src/IAmCommandReceiverShadow.cpp
+++ /dev/null
@@ -1,526 +0,0 @@
-/**
- *  Copyright (c) 2012 BMW
- *
- *  \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012
- *
- *  \copyright
- *  Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction,
- *  including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
- *  subject to the following conditions:
- *  The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- *  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- *  THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- *  For further information see http://www.genivi.org/.
- */
-
-#include "IAmCommandReceiverShadow.h"
-#include <string>
-#include <fstream>
-#include <stdexcept>
-#include <cassert>
-#include "audiomanagertypes.h"
-#include "CAmCommandSenderDbus.h"
-#include "shared/CAmDltWrapper.h"
-#include "configCommandDbus.h"
-
-using namespace am;
-
-DLT_IMPORT_CONTEXT(commandDbus)
-
-/**
- * static ObjectPathTable is needed for DBus Callback handling
- */
-static DBusObjectPathVTable gObjectPathVTable;
-
-IAmCommandReceiverShadow::IAmCommandReceiverShadow() :
-        mFunctionMap(createMap()), //
-        mDBUSMessageHandler(), //
-        mpIAmCommandReceive(NULL), //
-        mpCAmDbusWrapper(NULL)
-{
-    log(&commandDbus, DLT_LOG_INFO, "CommandReceiverShadow constructed");
-}
-
-IAmCommandReceiverShadow::~IAmCommandReceiverShadow()
-{
-    log(&commandDbus, DLT_LOG_INFO, "CommandReceiverShadow destructed");
-}
-
-void IAmCommandReceiverShadow::connect(DBusConnection *conn, DBusMessage *msg)
-{
-    log(&commandDbus, DLT_LOG_INFO, "CommandReceiverShadow::connect called");
-
-    (void) conn;
-    assert(mpIAmCommandReceive!=NULL);
-
-    mDBUSMessageHandler.initReceive(msg);
-    am_sourceID_t sourceID = (am_sourceID_t) mDBUSMessageHandler.getUInt();
-    am_sinkID_t sinkID = (am_sinkID_t) mDBUSMessageHandler.getUInt();
-    am_mainConnectionID_t mainConnectionID = 0;
-    am_Error_e returnCode = mpIAmCommandReceive->connect(sourceID, sinkID, mainConnectionID);
-    mDBUSMessageHandler.initReply(msg);
-    mDBUSMessageHandler.append((dbus_int16_t) returnCode);
-    mDBUSMessageHandler.append((dbus_uint16_t) mainConnectionID);
-    mDBUSMessageHandler.sendMessage();
-}
-
-void IAmCommandReceiverShadow::disconnect(DBusConnection *conn, DBusMessage *msg)
-{
-    log(&commandDbus, DLT_LOG_INFO, "CommandReceiverShadow::disconnect called");
-
-    (void) conn;
-    assert(mpIAmCommandReceive!=NULL);
-
-    mDBUSMessageHandler.initReceive(msg);
-    am_mainConnectionID_t mainConnnectionID = (am_mainConnectionID_t) mDBUSMessageHandler.getUInt();
-    am_Error_e returnCode = mpIAmCommandReceive->disconnect(mainConnnectionID);
-    mDBUSMessageHandler.initReply(msg);
-    mDBUSMessageHandler.append((dbus_int16_t) returnCode);
-    mDBUSMessageHandler.sendMessage();
-}
-
-void IAmCommandReceiverShadow::setVolume(DBusConnection *conn, DBusMessage *msg)
-{
-    log(&commandDbus, DLT_LOG_INFO, "CommandReceiverShadow::setVolume called");
-
-    (void) conn;
-    assert(mpIAmCommandReceive!=NULL);
-
-    mDBUSMessageHandler.initReceive(msg);
-    am_sinkID_t sinkID = (am_sinkID_t) mDBUSMessageHandler.getUInt();
-    am_volume_t volume = (am_volume_t) mDBUSMessageHandler.getInt();
-    am_Error_e returnCode = mpIAmCommandReceive->setVolume(sinkID, volume);
-    mDBUSMessageHandler.initReply(msg);
-    mDBUSMessageHandler.append((dbus_int16_t) returnCode);
-    mDBUSMessageHandler.sendMessage();
-}
-
-void IAmCommandReceiverShadow::volumeStep(DBusConnection *conn, DBusMessage *msg)
-{
-    log(&commandDbus, DLT_LOG_INFO, "CommandReceiverShadow::volumeStep called");
-
-    (void) conn;
-    assert(mpIAmCommandReceive!=NULL);
-
-    mDBUSMessageHandler.initReceive(msg);
-    am_sinkID_t sinkID = (am_sinkID_t) mDBUSMessageHandler.getUInt();
-    int16_t volumeStep = (int16_t) mDBUSMessageHandler.getInt();
-    am_Error_e returnCode = mpIAmCommandReceive->volumeStep(sinkID, volumeStep);
-    mDBUSMessageHandler.initReply(msg);
-    mDBUSMessageHandler.append((dbus_int16_t) returnCode);
-    mDBUSMessageHandler.sendMessage();
-}
-
-void IAmCommandReceiverShadow::setSinkMuteState(DBusConnection *conn, DBusMessage *msg)
-{
-    log(&commandDbus, DLT_LOG_INFO, "CommandReceiverShadow::setSinkMuteState called");
-
-    (void) conn;
-    assert(mpIAmCommandReceive!=NULL);
-
-    mDBUSMessageHandler.initReceive(msg);
-    am_sinkID_t sinkID = (am_sinkID_t) mDBUSMessageHandler.getUInt();
-    am_MuteState_e muteState = (am_MuteState_e) mDBUSMessageHandler.getInt();
-    am_Error_e returnCode = mpIAmCommandReceive->setSinkMuteState(sinkID, muteState);
-    mDBUSMessageHandler.initReply(msg);
-    mDBUSMessageHandler.append((dbus_int16_t) returnCode);
-    mDBUSMessageHandler.sendMessage();
-}
-
-void IAmCommandReceiverShadow::setMainSinkSoundProperty(DBusConnection *conn, DBusMessage *msg)
-{
-    log(&commandDbus, DLT_LOG_INFO, "CommandReceiverShadow::setMainSinkSoundProperty called");
-
-    (void) conn;
-    assert(mpIAmCommandReceive!=NULL);
-
-    mDBUSMessageHandler.initReceive(msg);
-    am_sinkID_t sinkID = (am_sinkID_t) mDBUSMessageHandler.getUInt();
-    dbus_int16_t type = 0;
-    dbus_int16_t value = 0;
-    mDBUSMessageHandler.getProperty(type, value);
-    am_MainSoundProperty_s mainSoundProperty;
-    mainSoundProperty.type = (am_CustomMainSoundPropertyType_t) type;
-    mainSoundProperty.value = (int32_t) value;
-    am_Error_e returnCode = mpIAmCommandReceive->setMainSinkSoundProperty(mainSoundProperty, sinkID);
-    mDBUSMessageHandler.initReply(msg);
-    mDBUSMessageHandler.append((dbus_int16_t) returnCode);
-    mDBUSMessageHandler.sendMessage();
-}
-
-void IAmCommandReceiverShadow::setMainSourceSoundProperty(DBusConnection *conn, DBusMessage *msg)
-{
-    log(&commandDbus, DLT_LOG_INFO, "CommandReceiverShadow::setMainSourceSoundProperty called");
-
-    (void) conn;
-    assert(mpIAmCommandReceive!=NULL);
-
-    mDBUSMessageHandler.initReceive(msg);
-    am_sourceID_t sourceID = (am_sinkID_t) mDBUSMessageHandler.getUInt();
-    dbus_int16_t type = 0;
-    dbus_int16_t value = 0;
-    mDBUSMessageHandler.getProperty(type, value);
-    am_MainSoundProperty_s mainSoundProperty;
-    mainSoundProperty.type = (am_CustomMainSoundPropertyType_t) type;
-    mainSoundProperty.value = (int32_t) value;
-    am_Error_e returnCode = mpIAmCommandReceive->setMainSourceSoundProperty(mainSoundProperty, sourceID);
-    mDBUSMessageHandler.initReply(msg);
-    mDBUSMessageHandler.append((dbus_int16_t) returnCode);
-    mDBUSMessageHandler.sendMessage();
-}
-
-void IAmCommandReceiverShadow::setSystemProperty(DBusConnection *conn, DBusMessage *msg)
-{
-    log(&commandDbus, DLT_LOG_INFO, "CommandReceiverShadow::setSystemProperty called");
-
-    (void) conn;
-    assert(mpIAmCommandReceive!=NULL);
-
-    mDBUSMessageHandler.initReceive(msg);
-    dbus_int16_t type = 0;
-    dbus_int16_t value = 0;
-    mDBUSMessageHandler.getProperty(type, value);
-    am_SystemProperty_s systemProperty;
-    systemProperty.type = (am_CustomSystemPropertyType_t) type;
-    systemProperty.value = (int32_t) value;
-    am_Error_e returnCode = mpIAmCommandReceive->setSystemProperty(systemProperty);
-    mDBUSMessageHandler.initReply(msg);
-    mDBUSMessageHandler.append((dbus_int16_t) returnCode);
-    mDBUSMessageHandler.sendMessage();
-}
-
-void IAmCommandReceiverShadow::getListMainConnections(DBusConnection *conn, DBusMessage *msg)
-{
-    log(&commandDbus, DLT_LOG_INFO, "CommandReceiverShadow::getListMainConnections called");
-
-    (void) conn;
-    assert(mpIAmCommandReceive!=NULL);
-    std::vector<am_MainConnectionType_s> listMainConnections;
-    am_Error_e returnCode = mpIAmCommandReceive->getListMainConnections(listMainConnections);
-    mDBUSMessageHandler.initReply(msg);
-    mDBUSMessageHandler.append((dbus_int16_t) returnCode);
-    mDBUSMessageHandler.append(listMainConnections);
-    mDBUSMessageHandler.sendMessage();
-}
-
-void IAmCommandReceiverShadow::getListMainSinks(DBusConnection *conn, DBusMessage *msg)
-{
-    log(&commandDbus, DLT_LOG_INFO, "CommandReceiverShadow::getListMainSinks called");
-
-    (void) conn;
-    assert(mpIAmCommandReceive!=NULL);
-    std::vector<am_SinkType_s> listSinks;
-    am_Error_e returnCode = mpIAmCommandReceive->getListMainSinks(listSinks);
-    mDBUSMessageHandler.initReply(msg);
-    mDBUSMessageHandler.append((dbus_int16_t) returnCode);
-    mDBUSMessageHandler.append(listSinks);
-    mDBUSMessageHandler.sendMessage();
-}
-
-void IAmCommandReceiverShadow::getListMainSources(DBusConnection *conn, DBusMessage *msg)
-{
-    log(&commandDbus, DLT_LOG_INFO, "CommandReceiverShadow::getListMainSources called");
-
-    (void) conn;
-    assert(mpIAmCommandReceive!=NULL);
-    std::vector<am_SourceType_s> listSources;
-    am_Error_e returnCode = mpIAmCommandReceive->getListMainSources(listSources);
-    mDBUSMessageHandler.initReply(msg);
-    mDBUSMessageHandler.append((dbus_int16_t) returnCode);
-    mDBUSMessageHandler.append(listSources);
-    mDBUSMessageHandler.sendMessage();
-}
-
-void IAmCommandReceiverShadow::getListMainSinkSoundProperties(DBusConnection *conn, DBusMessage *msg)
-{
-    log(&commandDbus, DLT_LOG_INFO, "CommandReceiverShadow::getListMainSinkSoundProperties called");
-
-    (void) conn;
-    assert(mpIAmCommandReceive!=NULL);
-
-    mDBUSMessageHandler.initReceive(msg);
-    am_sinkID_t sinkID = (am_sinkID_t) mDBUSMessageHandler.getUInt();
-    std::vector<am_MainSoundProperty_s> listSinkSoundProperties;
-    am_Error_e returnCode = mpIAmCommandReceive->getListMainSinkSoundProperties(sinkID, listSinkSoundProperties);
-    mDBUSMessageHandler.initReply(msg);
-    mDBUSMessageHandler.append((dbus_int16_t) returnCode);
-    mDBUSMessageHandler.append(listSinkSoundProperties);
-    mDBUSMessageHandler.sendMessage();
-}
-
-void IAmCommandReceiverShadow::getListMainSourceSoundProperties(DBusConnection *conn, DBusMessage *msg)
-{
-    log(&commandDbus, DLT_LOG_INFO, "CommandReceiverShadow::getListMainSourceSoundProperties called");
-
-    (void) conn;
-    assert(mpIAmCommandReceive!=NULL);
-
-    mDBUSMessageHandler.initReceive(msg);
-    am_sourceID_t sourceID = (am_sourceID_t) mDBUSMessageHandler.getUInt();
-    std::vector<am_MainSoundProperty_s> listSinkSoundProperties;
-    am_Error_e returnCode = mpIAmCommandReceive->getListMainSourceSoundProperties(sourceID, listSinkSoundProperties);
-    mDBUSMessageHandler.initReply(msg);
-    mDBUSMessageHandler.append((dbus_int16_t) returnCode);
-    mDBUSMessageHandler.append(listSinkSoundProperties);
-    mDBUSMessageHandler.sendMessage();
-}
-
-void IAmCommandReceiverShadow::getListSourceClasses(DBusConnection *conn, DBusMessage *msg)
-{
-    log(&commandDbus, DLT_LOG_INFO, "CommandReceiverShadow::getListSourceClasses called");
-
-    (void) conn;
-    assert(mpIAmCommandReceive!=NULL);
-    std::vector<am_SourceClass_s> listSourceClasses;
-    am_Error_e returnCode = mpIAmCommandReceive->getListSourceClasses(listSourceClasses);
-    mDBUSMessageHandler.initReply(msg);
-    mDBUSMessageHandler.append((dbus_int16_t) returnCode);
-    mDBUSMessageHandler.append(listSourceClasses);
-    mDBUSMessageHandler.sendMessage();
-}
-
-void IAmCommandReceiverShadow::getListSinkClasses(DBusConnection *conn, DBusMessage *msg)
-{
-    log(&commandDbus, DLT_LOG_INFO, "CommandReceiverShadow::getListSinkClasses called");
-
-    (void) conn;
-    assert(mpIAmCommandReceive!=NULL);
-    std::vector<am_SinkClass_s> listSinkClasses;
-    am_Error_e returnCode = mpIAmCommandReceive->getListSinkClasses(listSinkClasses);
-    mDBUSMessageHandler.initReply(msg);
-    mDBUSMessageHandler.append((dbus_int16_t) returnCode);
-    mDBUSMessageHandler.append(listSinkClasses);
-    mDBUSMessageHandler.sendMessage();
-}
-
-void IAmCommandReceiverShadow::getListSystemProperties(DBusConnection *conn, DBusMessage *msg)
-{
-    log(&commandDbus, DLT_LOG_INFO, "CommandReceiverShadow::getListSystemProperties called");
-
-    (void) conn;
-    assert(mpIAmCommandReceive!=NULL);
-    std::vector<am_SystemProperty_s> listSystemProperties;
-    am_Error_e returnCode = mpIAmCommandReceive->getListSystemProperties(listSystemProperties);
-    mDBUSMessageHandler.initReply(msg);
-    mDBUSMessageHandler.append((dbus_int16_t) returnCode);
-    mDBUSMessageHandler.append(listSystemProperties);
-    mDBUSMessageHandler.sendMessage();
-}
-
-void IAmCommandReceiverShadow::getTimingInformation(DBusConnection *conn, DBusMessage *msg)
-{
-    log(&commandDbus, DLT_LOG_INFO, "CommandReceiverShadow::getTimingInformation called");
-
-    (void) conn;
-    assert(mpIAmCommandReceive!=NULL);
-
-    mDBUSMessageHandler.initReceive(msg);
-    am_mainConnectionID_t mainConnectionID = (am_mainConnectionID_t) mDBUSMessageHandler.getUInt();
-    am_timeSync_t delay = 0;
-    am_Error_e returnCode = mpIAmCommandReceive->getTimingInformation(mainConnectionID, delay);
-    mDBUSMessageHandler.initReply(msg);
-    mDBUSMessageHandler.append((dbus_int16_t) returnCode);
-    mDBUSMessageHandler.append((dbus_int16_t) delay);
-    mDBUSMessageHandler.sendMessage();
-}
-
-DBusHandlerResult IAmCommandReceiverShadow::receiveCallback(DBusConnection *conn, DBusMessage *msg, void *user_data)
-{
-    assert(conn!=NULL);
-    assert(msg!=NULL);
-    assert(user_data!=NULL);
-    IAmCommandReceiverShadow* reference = (IAmCommandReceiverShadow*) user_data;
-    return (reference->receiveCallbackDelegate(conn, msg));
-}
-
-void IAmCommandReceiverShadow::sendIntrospection(DBusConnection *conn, DBusMessage *msg)
-{
-    assert(conn!=NULL);
-    assert(msg!=NULL);
-    DBusMessage* reply;
-    DBusMessageIter args;
-    dbus_uint32_t serial = 0;
-
-    // create a reply from the message
-    reply = dbus_message_new_method_return(msg);
-    std::string fullpath(COMMAND_DBUS_INTROSPECTION_FILE);
-    std::ifstream in(fullpath.c_str(), std::ifstream::in);
-    if (!in)
-    {
-        logError("IAmCommandReceiverShadow::sendIntrospection could not load xml file ",fullpath);
-        throw std::runtime_error("IAmCommandReceiverShadow::sendIntrospection Could not load introspecton XML");
-    }
-    std::string introspect((std::istreambuf_iterator<char>(in)), std::istreambuf_iterator<char>());
-    const char* string = introspect.c_str();
-
-    // add the arguments to the reply
-    dbus_message_iter_init_append(reply, &args);
-    if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &string))
-    {
-        //	DLT_LOG(DLT_CONTEXT,DLT_LOG_ERROR, DLT_STRING("DBUS handler Out Of Memory!"));
-    }
-
-    // send the reply && flush the connection
-    if (!dbus_connection_send(conn, reply, &serial))
-    {
-        //	DLT_LOG(DLT_CONTEXT,DLT_LOG_ERROR, DLT_STRING("DBUS handler Out Of Memory!"));
-    }
-    dbus_connection_flush(conn);
-
-    // free the reply
-    dbus_message_unref(reply);
-}
-
-DBusHandlerResult IAmCommandReceiverShadow::receiveCallbackDelegate(DBusConnection *conn, DBusMessage *msg)
-{
-    //DLT_LOG(dMain, DLT_LOG_INFO, DLT_STRING("message received"));
-
-    if (dbus_message_is_method_call(msg, DBUS_INTERFACE_INTROSPECTABLE, "Introspect"))
-    {
-        sendIntrospection(conn, msg);
-        return (DBUS_HANDLER_RESULT_HANDLED);
-    }
-
-    functionMap_t::iterator iter = mFunctionMap.begin();
-    std::string k(dbus_message_get_member(msg));
-    iter = mFunctionMap.find(k);
-    if (iter != mFunctionMap.end())
-    {
-        std::string p(iter->first);
-        CallBackMethod cb = iter->second;
-        (this->*cb)(conn, msg);
-        return (DBUS_HANDLER_RESULT_HANDLED);
-    }
-
-    return (DBUS_HANDLER_RESULT_NOT_YET_HANDLED);
-}
-
-void IAmCommandReceiverShadow::setCommandReceiver(IAmCommandReceive*& receiver)
-{
-    assert(receiver!=NULL);
-    mpIAmCommandReceive = receiver;
-
-    gObjectPathVTable.message_function = IAmCommandReceiverShadow::receiveCallback;
-
-    DBusConnection* connection;
-    mpIAmCommandReceive->getDBusConnectionWrapper(mpCAmDbusWrapper);
-    assert(mpCAmDbusWrapper!=NULL);
-
-    mpCAmDbusWrapper->getDBusConnection(connection);
-    assert(connection!=NULL);
-    mDBUSMessageHandler.setDBusConnection(connection);
-
-    std::string path(MY_NODE);
-    mpCAmDbusWrapper->registerCallback(&gObjectPathVTable, path, this);
-}
-
-void am::IAmCommandReceiverShadow::getListSinkMainNotificationConfigurations(DBusConnection* conn, DBusMessage* msg)
-{
-    log(&commandDbus, DLT_LOG_INFO, "CommandReceiverShadow::getListSinkMainNotificationConfigurations called");
-
-    (void) conn;
-    assert(mpIAmCommandReceive!=NULL);
-
-    mDBUSMessageHandler.initReceive(msg);
-    am_sinkID_t sinkID = static_cast<am_sinkID_t>(mDBUSMessageHandler.getUInt());
-    std::vector<am_NotificationConfiguration_s> listNotificationConfigurations;
-    am_Error_e returnCode = mpIAmCommandReceive->getListMainSinkNotificationConfigurations(sinkID,listNotificationConfigurations);
-    mDBUSMessageHandler.initReply(msg);
-    mDBUSMessageHandler.append((dbus_int16_t) returnCode);
-    mDBUSMessageHandler.append(listNotificationConfigurations);
-    mDBUSMessageHandler.sendMessage();
-}
-
-void am::IAmCommandReceiverShadow::getListSourceMainNotificationConfigurations(DBusConnection* conn, DBusMessage* msg)
-{
-    log(&commandDbus, DLT_LOG_INFO, "CommandReceiverShadow::getListSourceMainNotificationConfigurations called");
-
-    (void) conn;
-    assert(mpIAmCommandReceive!=NULL);
-
-    mDBUSMessageHandler.initReceive(msg);
-    am_sourceID_t sourceID = static_cast<am_sourceID_t>(mDBUSMessageHandler.getUInt());
-    std::vector<am_NotificationConfiguration_s> listNotificationConfigurations;
-    am_Error_e returnCode = mpIAmCommandReceive->getListMainSourceNotificationConfigurations(sourceID,listNotificationConfigurations);
-    mDBUSMessageHandler.initReply(msg);
-    mDBUSMessageHandler.append((dbus_int16_t) returnCode);
-    mDBUSMessageHandler.append(listNotificationConfigurations);
-    mDBUSMessageHandler.sendMessage();
-
-}
-
-void am::IAmCommandReceiverShadow::setSinkMainNotificationConfiguration(DBusConnection* conn, DBusMessage* msg)
-{
-    log(&commandDbus, DLT_LOG_INFO, "CommandReceiverShadow::setSinkMainNotificationConfiguration called");
-
-    (void) conn;
-    assert(mpIAmCommandReceive!=NULL);
-
-    mDBUSMessageHandler.initReceive(msg);
-    am_sinkID_t sinkID = (am_sinkID_t) mDBUSMessageHandler.getUInt();
-    dbus_int16_t type = 0;
-    dbus_int16_t status = 0;
-    dbus_int16_t parameter = 0;
-    mDBUSMessageHandler.getNotificationConfiguration(type, status, parameter);
-    am_NotificationConfiguration_s mainNotificationConfiguration;
-    mainNotificationConfiguration.type = static_cast<am_CustomNotificationType_t> (type);
-    mainNotificationConfiguration.status = static_cast<am_NotificationStatus_e> (status);
-    mainNotificationConfiguration.parameter = static_cast<int16_t>(parameter);
-    am_Error_e returnCode = mpIAmCommandReceive->setMainSinkNotificationConfiguration(sinkID,mainNotificationConfiguration);
-    mDBUSMessageHandler.initReply(msg);
-    mDBUSMessageHandler.append((dbus_int16_t) returnCode);
-    mDBUSMessageHandler.sendMessage();
-}
-
-void am::IAmCommandReceiverShadow::setSourceMainNotificationConfiguration(DBusConnection* conn, DBusMessage* msg)
-{
-    log(&commandDbus, DLT_LOG_INFO, "CommandReceiverShadow::setSourceMainNotificationConfiguration called");
-
-    (void) conn;
-    assert(mpIAmCommandReceive!=NULL);
-
-    mDBUSMessageHandler.initReceive(msg);
-    am_sourceID_t sourceID = (am_sourceID_t) mDBUSMessageHandler.getUInt();
-    dbus_int16_t type = 0;
-    dbus_int16_t status = 0;
-    dbus_int16_t parameter = 0;
-    mDBUSMessageHandler.getNotificationConfiguration(type, status, parameter);
-    am_NotificationConfiguration_s mainNotificationConfiguration;
-    mainNotificationConfiguration.type = static_cast<am_CustomNotificationType_t> (type);
-    mainNotificationConfiguration.status = static_cast<am_NotificationStatus_e> (status);
-    mainNotificationConfiguration.parameter = static_cast<int16_t>(parameter);
-    am_Error_e returnCode = mpIAmCommandReceive->setMainSourceNotificationConfiguration(sourceID,mainNotificationConfiguration);
-    mDBUSMessageHandler.initReply(msg);
-    mDBUSMessageHandler.append((dbus_int16_t) returnCode);
-    mDBUSMessageHandler.sendMessage();
-}
-
-IAmCommandReceiverShadow::functionMap_t IAmCommandReceiverShadow::createMap()
-{
-    functionMap_t m;
-    m["Connect"] = &IAmCommandReceiverShadow::connect;
-    m["Disconnect"] = &IAmCommandReceiverShadow::disconnect;
-    m["SetVolume"] = &IAmCommandReceiverShadow::setVolume;
-    m["VolumeStep"] = &IAmCommandReceiverShadow::volumeStep;
-    m["SetSinkMuteState"] = &IAmCommandReceiverShadow::setSinkMuteState;
-    m["SetMainSinkSoundProperty"] = &IAmCommandReceiverShadow::setMainSinkSoundProperty;
-    m["SetMainSourceSoundProperty"] = &IAmCommandReceiverShadow::setMainSourceSoundProperty;
-    m["GetListMainConnections"] = &IAmCommandReceiverShadow::getListMainConnections;
-    m["GetListMainSinks"] = &IAmCommandReceiverShadow::getListMainSinks;
-    m["GetListMainSources"] = &IAmCommandReceiverShadow::getListMainSources;
-    m["GetListMainSinkSoundProperties"] = &IAmCommandReceiverShadow::getListMainSinkSoundProperties;
-    m["GetListMainSourceSoundProperties"] = &IAmCommandReceiverShadow::getListMainSourceSoundProperties;
-    m["GetListSourceClasses"] = &IAmCommandReceiverShadow::getListSourceClasses;
-    m["GetListSinkClasses"] = &IAmCommandReceiverShadow::getListSinkClasses;
-    m["GetListSystemProperties"] = &IAmCommandReceiverShadow::getListSystemProperties;
-    m["GetTimingInformation"] = &IAmCommandReceiverShadow::getTimingInformation;
-    m["SetSystemProperty"] = &IAmCommandReceiverShadow::setSystemProperty;
-    m["getListSinkMainNotificationConfigurations"] = &IAmCommandReceiverShadow::getListSinkMainNotificationConfigurations;
-    m["getListSourceMainNotificationConfigurations"] = &IAmCommandReceiverShadow::getListSourceMainNotificationConfigurations;
-    m["setSinkMainNotificationConfiguration"] = &IAmCommandReceiverShadow::setSinkMainNotificationConfiguration;
-    m["setSourceMainNotificationConfiguration"] = & IAmCommandReceiverShadow::setSourceMainNotificationConfiguration;
-    return (m);
-}
-