* [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

4 files changed, 40 insertions, 39 deletions

diff --git a/PluginRoutingInterfaceAsync/CMakeLists.txt b/PluginRoutingInterfaceAsync/CMakeLists.txt
index 2ccb6da..598b4fe 100644
--- a/PluginRoutingInterfaceAsync/CMakeLists.txt
+++ b/PluginRoutingInterfaceAsync/CMakeLists.txt
@@ -30,7 +30,7 @@ set(INCLUDES_FOLDER "include")
 
 FILE(READ "${AUDIO_INCLUDES_FOLDER}/routing/RoutingSendInterface.h" VERSION_BUFFER LIMIT 6000)
 STRING(REGEX MATCH "RoutingSendVersion*.[^0-9]*[0-9].[0-9]*[0-9]" LIB_INTERFACE_VERSION_STRING ${VERSION_BUFFER})
-STRING(REGEX REPLACE "RoutingSendVersion*." "" LIB_INTERFACE_VERSION ${LIB_INTERFACE_VERSION_STRING})
+STRING(REGEX REPLACE "RoutingSendVersion*.." "" LIB_INTERFACE_VERSION ${LIB_INTERFACE_VERSION_STRING})
 MESSAGE(STATUS "Building against routing interface version ${LIB_INTERFACE_VERSION}")
 
 find_package( Threads )
diff --git a/PluginRoutingInterfaceAsync/include/RoutingSenderAsyn.h b/PluginRoutingInterfaceAsync/include/RoutingSenderAsyn.h
index 4dcf29c..dd88be1 100644
--- a/PluginRoutingInterfaceAsync/include/RoutingSenderAsyn.h
+++ b/PluginRoutingInterfaceAsync/include/RoutingSenderAsyn.h
@@ -129,23 +129,23 @@ class AsyncRoutingSender: public RoutingSendInterface
 public:
     AsyncRoutingSender();
     virtual ~AsyncRoutingSender();
-    void startupRoutingInterface(RoutingReceiveInterface* routingreceiveinterface);
-    void routingInterfacesReady();
-    void routingInterfacesRundown();
-    am_Error_e asyncAbort(const am_Handle_s handle);
-    am_Error_e asyncConnect(const am_Handle_s handle, const am_connectionID_t connectionID, const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_ConnectionFormat_e connectionFormat);
-    am_Error_e asyncDisconnect(const am_Handle_s handle, const am_connectionID_t connectionID);
-    am_Error_e asyncSetSinkVolume(const am_Handle_s handle, const am_sinkID_t sinkID, const am_volume_t volume, const am_RampType_e ramp, const am_time_t time);
-    am_Error_e asyncSetSourceVolume(const am_Handle_s handle, const am_sourceID_t sourceID, const am_volume_t volume, const am_RampType_e ramp, const am_time_t time);
-    am_Error_e asyncSetSourceState(const am_Handle_s handle, const am_sourceID_t sourceID, const am_SourceState_e state);
-    am_Error_e asyncSetSinkSoundProperty(const am_Handle_s handle, const am_sinkID_t sinkID, const am_SoundProperty_s& soundProperty);
-    am_Error_e asyncSetSinkSoundProperties(const am_Handle_s handle, const am_sinkID_t sinkID, const std::vector<am_SoundProperty_s>& listSoundProperties);
-    am_Error_e asyncSetSourceSoundProperty(const am_Handle_s handle, const am_sourceID_t sourceID, const am_SoundProperty_s& soundProperty);
-    am_Error_e asyncSetSourceSoundProperties(const am_Handle_s handle, const am_sourceID_t sourceID, const std::vector<am_SoundProperty_s>& listSoundProperties);
-    am_Error_e asyncCrossFade(const am_Handle_s handle, const am_crossfaderID_t crossfaderID, const am_HotSink_e hotSink, const am_RampType_e rampType, const am_time_t time);
-    am_Error_e setDomainState(const am_domainID_t domainID, const am_DomainState_e domainState);
-    am_Error_e returnBusName(std::string& BusName) const;
-    uint16_t getInterfaceVersion() const;
+    am_Error_e startupInterface(RoutingReceiveInterface* routingreceiveinterface) ;
+    void setRoutingReady(const uint16_t handle) ;
+    void setRoutingRundown(const uint16_t handle) ;
+    am_Error_e asyncAbort(const am_Handle_s handle) ;
+    am_Error_e asyncConnect(const am_Handle_s handle, const am_connectionID_t connectionID, const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_ConnectionFormat_e connectionFormat) ;
+    am_Error_e asyncDisconnect(const am_Handle_s handle, const am_connectionID_t connectionID) ;
+    am_Error_e asyncSetSinkVolume(const am_Handle_s handle, const am_sinkID_t sinkID, const am_volume_t volume, const am_RampType_e ramp, const am_time_t time) ;
+    am_Error_e asyncSetSourceVolume(const am_Handle_s handle, const am_sourceID_t sourceID, const am_volume_t volume, const am_RampType_e ramp, const am_time_t time) ;
+    am_Error_e asyncSetSourceState(const am_Handle_s handle, const am_sourceID_t sourceID, const am_SourceState_e state) ;
+    am_Error_e asyncSetSinkSoundProperties(const am_Handle_s handle, const am_sinkID_t sinkID, const std::vector<am_SoundProperty_s>& listSoundProperties) ;
+    am_Error_e asyncSetSinkSoundProperty(const am_Handle_s handle, const am_sinkID_t sinkID, const am_SoundProperty_s& soundProperty) ;
+    am_Error_e asyncSetSourceSoundProperties(const am_Handle_s handle, const am_sourceID_t sourceID, const std::vector<am_SoundProperty_s>& listSoundProperties) ;
+    am_Error_e asyncSetSourceSoundProperty(const am_Handle_s handle, const am_sourceID_t sourceID, const am_SoundProperty_s& soundProperty) ;
+    am_Error_e asyncCrossFade(const am_Handle_s handle, const am_crossfaderID_t crossfaderID, const am_HotSink_e hotSink, const am_RampType_e rampType, const am_time_t time) ;
+    am_Error_e setDomainState(const am_domainID_t domainID, const am_DomainState_e domainState) ;
+    am_Error_e returnBusName(std::string& BusName) const ;
+    void getInterfaceVersion(std::string& version) const ;
 
     /**
      * threadafe insert of route and connectionID
diff --git a/PluginRoutingInterfaceAsync/src/RoutingReceiverAsyncShadow.cpp b/PluginRoutingInterfaceAsync/src/RoutingReceiverAsyncShadow.cpp
index 17e5a93..c11201e 100644
--- a/PluginRoutingInterfaceAsync/src/RoutingReceiverAsyncShadow.cpp
+++ b/PluginRoutingInterfaceAsync/src/RoutingReceiverAsyncShadow.cpp
@@ -74,7 +74,7 @@ void RoutingReceiverAsyncShadow::ackConnect(const am_Handle_s handle, const am_c
     //ok, fire the signal that data needs to be received !
     if (write(mPipe[1], &msg.msgID, sizeof(msgID_e)) == -1)
     {
-        logError("RoutingReceiverAsyncShadow::ackConnect write failed, error code:",strerror(errno));
+        logError("RoutingReceiverAsyncShadow::ackConnect write failed, error code:", strerror(errno));
     }
 }
 
@@ -98,7 +98,7 @@ void RoutingReceiverAsyncShadow::ackDisconnect(const am_Handle_s handle, const a
     //ok, fire the signal that data needs to be received !
     if (write(mPipe[1], &msg.msgID, sizeof(msgID_e)) == -1)
     {
-        logError("RoutingReceiverAsyncShadow::ackDisconnect write failed, error code:",strerror(errno));
+        logError("RoutingReceiverAsyncShadow::ackDisconnect write failed, error code:", strerror(errno));
     }
 }
 
@@ -122,7 +122,7 @@ void RoutingReceiverAsyncShadow::ackSetSinkVolumeChange(const am_Handle_s handle
     //ok, fire the signal that data needs to be received !
     if (write(mPipe[1], &msg.msgID, sizeof(msgID_e)) == -1)
     {
-        logError("RoutingReceiverAsyncShadow::ackSetSinkVolumeChange write failed, error code:",strerror(errno));
+        logError("RoutingReceiverAsyncShadow::ackSetSinkVolumeChange write failed, error code:", strerror(errno));
     }
 }
 
@@ -146,7 +146,7 @@ void RoutingReceiverAsyncShadow::ackSetSourceVolumeChange(const am_Handle_s hand
     //ok, fire the signal that data needs to be received !
     if (write(mPipe[1], &msg.msgID, sizeof(msgID_e)) == -1)
     {
-        logError("RoutingReceiverAsyncShadow::ackSetSourceVolumeChange write failed, error code:",strerror(errno));
+        logError("RoutingReceiverAsyncShadow::ackSetSourceVolumeChange write failed, error code:", strerror(errno));
     }
 }
 
@@ -169,7 +169,7 @@ void RoutingReceiverAsyncShadow::ackSetSourceState(const am_Handle_s handle, con
     //ok, fire the signal that data needs to be received !
     if (write(mPipe[1], &msg.msgID, sizeof(msgID_e)) == -1)
     {
-        logError("RoutingReceiverAsyncShadow::ackSetSourceState write failed, error code:",strerror(errno));
+        logError("RoutingReceiverAsyncShadow::ackSetSourceState write failed, error code:", strerror(errno));
     }
 }
 
@@ -192,7 +192,7 @@ void RoutingReceiverAsyncShadow::ackSetSinkSoundProperty(const am_Handle_s handl
     //ok, fire the signal that data needs to be received !
     if (write(mPipe[1], &msg.msgID, sizeof(msgID_e)) == -1)
     {
-        logError("RoutingReceiverAsyncShadow::ackSetSinkSoundProperty write failed, error code:",strerror(errno));
+        logError("RoutingReceiverAsyncShadow::ackSetSinkSoundProperty write failed, error code:", strerror(errno));
     }
 }
 
@@ -215,7 +215,7 @@ void RoutingReceiverAsyncShadow::ackSetSourceSoundProperty(const am_Handle_s han
     //ok, fire the signal that data needs to be received !
     if (write(mPipe[1], &msg.msgID, sizeof(msgID_e)) == -1)
     {
-        logError("RoutingReceiverAsyncShadow::ackSetSourceSoundProperty write failed, error code:",strerror(errno));
+        logError("RoutingReceiverAsyncShadow::ackSetSourceSoundProperty write failed, error code:", strerror(errno));
     }
 }
 
@@ -239,7 +239,7 @@ void RoutingReceiverAsyncShadow::ackCrossFading(const am_Handle_s handle, const
     //ok, fire the signal that data needs to be received !
     if (write(mPipe[1], &msg.msgID, sizeof(msgID_e)) == -1)
     {
-        logError("RoutingReceiverAsyncShadow::ackCrossFading write failed, error code:",strerror(errno));
+        logError("RoutingReceiverAsyncShadow::ackCrossFading write failed, error code:", strerror(errno));
     }
 }
 
@@ -263,7 +263,7 @@ void RoutingReceiverAsyncShadow::ackSourceVolumeTick(const am_Handle_s handle, c
     //ok, fire the signal that data needs to be received !
     if (write(mPipe[1], &msg.msgID, sizeof(msgID_e)) == -1)
     {
-        logError("RoutingReceiverAsyncShadow::ackSourceVolumeTick write failed, error code:",strerror(errno));
+        logError("RoutingReceiverAsyncShadow::ackSourceVolumeTick write failed, error code:", strerror(errno));
     }
 }
 
@@ -287,7 +287,7 @@ void RoutingReceiverAsyncShadow::ackSinkVolumeTick(const am_Handle_s handle, con
     //ok, fire the signal that data needs to be received !
     if (write(mPipe[1], &msg.msgID, sizeof(msgID_e)) == -1)
     {
-        logError("RoutingReceiverAsyncShadow::ackSinkVolumeTick write failed, error code:",strerror(errno));
+        logError("RoutingReceiverAsyncShadow::ackSinkVolumeTick write failed, error code:", strerror(errno));
     }
 }
 
@@ -311,7 +311,7 @@ void RoutingReceiverAsyncShadow::hookInterruptStatusChange(const am_sourceID_t s
     //ok, fire the signal that data needs to be received !
     if (write(mPipe[1], &msg.msgID, sizeof(msgID_e)) == -1)
     {
-        logError("RoutingReceiverAsyncShadow::hookInterruptStatusChange write failed, error code:",strerror(errno));
+        logError("RoutingReceiverAsyncShadow::hookInterruptStatusChange write failed, error code:", strerror(errno));
     }
 }
 
@@ -335,7 +335,7 @@ void RoutingReceiverAsyncShadow::hookSinkAvailablityStatusChange(const am_sinkID
     //ok, fire the signal that data needs to be received !
     if (write(mPipe[1], &msg.msgID, sizeof(msgID_e)) == -1)
     {
-        logError("RoutingReceiverAsyncShadow::hookSinkAvailablityStatusChange write failed, error code:",strerror(errno));
+        logError("RoutingReceiverAsyncShadow::hookSinkAvailablityStatusChange write failed, error code:", strerror(errno));
     }
 }
 
@@ -359,7 +359,7 @@ void RoutingReceiverAsyncShadow::hookSourceAvailablityStatusChange(const am_sour
     //ok, fire the signal that data needs to be received !
     if (write(mPipe[1], &msg.msgID, sizeof(msgID_e)) == -1)
     {
-        logError("RoutingReceiverAsyncShadow::hookSourceAvailablityStatusChange write failed, error code:",strerror(errno));
+        logError("RoutingReceiverAsyncShadow::hookSourceAvailablityStatusChange write failed, error code:", strerror(errno));
     }
 }
 
@@ -383,7 +383,7 @@ void RoutingReceiverAsyncShadow::hookDomainStateChange(const am_domainID_t domai
     //ok, fire the signal that data needs to be received !
     if (write(mPipe[1], &msg.msgID, sizeof(msgID_e)) == -1)
     {
-        logError("RoutingReceiverAsyncShadow::hookDomainStateChange write failed, error code:",strerror(errno));
+        logError("RoutingReceiverAsyncShadow::hookDomainStateChange write failed, error code:", strerror(errno));
     }
 }
 
@@ -407,7 +407,7 @@ void RoutingReceiverAsyncShadow::hookTimingInformationChanged(const am_connectio
     //ok, fire the signal that data needs to be received !
     if (write(mPipe[1], &msg.msgID, sizeof(msgID_e)) == -1)
     {
-        logError("RoutingReceiverAsyncShadow::hookTimingInformationChanged write failed, error code:",strerror(errno));
+        logError("RoutingReceiverAsyncShadow::hookTimingInformationChanged write failed, error code:", strerror(errno));
     }
 }
 
@@ -484,7 +484,7 @@ bool RoutingReceiverAsyncShadow::asyncDispatcher(const sh_pollHandle_t handle, v
         mRoutingReceiveInterface->hookTimingInformationChanged(msg.parameters.timingInfoChange.connectionID, msg.parameters.timingInfoChange.delay);
         break;
     default:
-        logError("RoutingReceiverAsyncShadow::asyncDispatcher unknown message was received:",msg.msgID);
+        logError("RoutingReceiverAsyncShadow::asyncDispatcher unknown message was received:", msg.msgID);
         break;
     }
 
diff --git a/PluginRoutingInterfaceAsync/src/RoutingSenderAsync.cpp b/PluginRoutingInterfaceAsync/src/RoutingSenderAsync.cpp
index 4993f76..1a1ee70 100644
--- a/PluginRoutingInterfaceAsync/src/RoutingSenderAsync.cpp
+++ b/PluginRoutingInterfaceAsync/src/RoutingSenderAsync.cpp
@@ -278,7 +278,7 @@ AsyncRoutingSender::~AsyncRoutingSender()
 {
 }
 
-void AsyncRoutingSender::startupRoutingInterface(RoutingReceiveInterface *routingreceiveinterface)
+am_Error_e AsyncRoutingSender::startupInterface(RoutingReceiveInterface *routingreceiveinterface)
 {
     //first, create the Shadow:
     assert(routingreceiveinterface!=0);
@@ -286,8 +286,9 @@ void AsyncRoutingSender::startupRoutingInterface(RoutingReceiveInterface *routin
     mShadow.setRoutingInterface(routingreceiveinterface);
 }
 
-void AsyncRoutingSender::routingInterfacesReady()
+void AsyncRoutingSender::setRoutingReady(const uint16_t handle)
 {
+    //todo: implement handle !
     assert(mReceiveInterface!=0);
     am_Error_e eCode;
     //first register the domains
@@ -348,7 +349,7 @@ void AsyncRoutingSender::routingInterfacesReady()
     //pthread_create(&mInterruptThread,NULL,&AsyncRoutingSender::InterruptEvents,&mShadow);
 }
 
-void AsyncRoutingSender::routingInterfacesRundown()
+void AsyncRoutingSender::setRoutingRundown(const uint16_t handle)
 {
     assert(mReceiveInterface!=0);
 }
@@ -952,9 +953,9 @@ void am::AsyncRoutingSender::updateDomainstateSafe(am_domainID_t domainID, am_Do
     pthread_mutex_unlock(&mDomainsMutex);
 }
 
-uint16_t AsyncRoutingSender::getInterfaceVersion() const
+void AsyncRoutingSender::getInterfaceVersion(std::string & version) const
 {
-    return (RoutingSendVersion);
+    version = RoutingSendVersion;
 }
 
 am_Error_e AsyncRoutingSender::asyncSetSourceSoundProperties(const am_Handle_s handle, const am_sourceID_t sourceID, const std::vector<am_SoundProperty_s> & listSoundProperties)