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

3 files changed, 37 insertions, 14 deletions

diff --git a/PluginControlInterface/CMakeLists.txt b/PluginControlInterface/CMakeLists.txt
index 7bd3bb1..5946df7 100644
--- a/PluginControlInterface/CMakeLists.txt
+++ b/PluginControlInterface/CMakeLists.txt
@@ -8,7 +8,7 @@ set(INCLUDES_FOLDER "include")
 
 FILE(READ "${AUDIO_INCLUDES_FOLDER}/control/ControlSendInterface.h" VERSION_BUFFER LIMIT 6000)
 STRING(REGEX MATCH "ControlSendVersion*.[^0-9]*[0-9].[0-9]*[0-9]" LIB_INTERFACE_VERSION_STRING ${VERSION_BUFFER})
-STRING(REGEX REPLACE "ControlSendVersion*." "" LIB_INTERFACE_VERSION ${LIB_INTERFACE_VERSION_STRING})
+STRING(REGEX REPLACE "ControlSendVersion*.." "" LIB_INTERFACE_VERSION ${LIB_INTERFACE_VERSION_STRING})
 MESSAGE(STATUS "Building against control interface version ${LIB_INTERFACE_VERSION}")
 
 INCLUDE_DIRECTORIES(
diff --git a/PluginControlInterface/include/ControlSender.h b/PluginControlInterface/include/ControlSender.h
index 0e98768..e96f445 100644
--- a/PluginControlInterface/include/ControlSender.h
+++ b/PluginControlInterface/include/ControlSender.h
@@ -37,8 +37,8 @@ public:
     ControlSenderPlugin();
     virtual ~ControlSenderPlugin();
     am_Error_e startupController(ControlReceiveInterface* controlreceiveinterface);
-    am_Error_e stopController();
-    void hookAllPluginsLoaded();
+    void setControllerReady();
+    void setControllerRundown();
     am_Error_e hookUserConnectionRequest(const am_sourceID_t sourceID, const am_sinkID_t sinkID, am_mainConnectionID_t& mainConnectionID);
     am_Error_e hookUserDisconnectionRequest(const am_mainConnectionID_t connectionID);
     am_Error_e hookUserSetMainSinkSoundProperty(const am_sinkID_t sinkID, const am_MainSoundProperty_s& soundProperty);
@@ -73,12 +73,16 @@ public:
     void cbAckSetSinkVolumeChange(const am_Handle_s handle, const am_volume_t volume, const am_Error_e error);
     void cbAckSetSourceVolumeChange(const am_Handle_s handle, const am_volume_t voulme, const am_Error_e error);
     void cbAckSetSourceState(const am_Handle_s handle, const am_Error_e error);
-    void cbAckSetSourceSoundProperty(const am_Handle_s handle, const am_Error_e error);
     void cbAckSetSourceSoundProperties(const am_Handle_s handle, const am_Error_e error);
-    void cbAckSetSinkSoundProperty(const am_Handle_s handle, const am_Error_e error);
+    void cbAckSetSourceSoundProperty(const am_Handle_s handle, const am_Error_e error);
     void cbAckSetSinkSoundProperties(const am_Handle_s handle, const am_Error_e error);
+    void cbAckSetSinkSoundProperty(const am_Handle_s handle, const am_Error_e error);
     am_Error_e 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);
-    uint16_t getInterfaceVersion() const;
+    void getInterfaceVersion(std::string& version) const;
+    void confirmCommandReady();
+    void confirmRoutingReady();
+    void confirmCommandRundown();
+    void confirmRoutingRundown();
 
 private:
     ControlReceiveInterface * mControlReceiveInterface;
diff --git a/PluginControlInterface/src/ControlSender.cpp b/PluginControlInterface/src/ControlSender.cpp
index 60ae417..052d1ff 100644
--- a/PluginControlInterface/src/ControlSender.cpp
+++ b/PluginControlInterface/src/ControlSender.cpp
@@ -61,12 +61,7 @@ am_Error_e ControlSenderPlugin::startupController(ControlReceiveInterface *contr
     return E_NOT_USED;
 }
 
-am_Error_e ControlSenderPlugin::stopController()
-{
-    return E_NOT_USED;
-}
-
-void ControlSenderPlugin::hookAllPluginsLoaded()
+void ControlSenderPlugin::setControllerReady()
 {
     //here is a good place to insert Source and SinkClasses into the database...
     mControlReceiveInterface->setRoutingReady();
@@ -440,6 +435,10 @@ void ControlSenderPlugin::cbAckSetSinkSoundProperties(const am_Handle_s handle,
     (void) handle;
 }
 
+void ControlSenderPlugin::setControllerRundown()
+{
+}
+
 am_Error_e ControlSenderPlugin::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)
 {
     (void) sourceID;
@@ -450,8 +449,28 @@ am_Error_e ControlSenderPlugin::getConnectionFormatChoice(const am_sourceID_t so
     return (E_OK);
 }
 
-uint16_t ControlSenderPlugin::getInterfaceVersion() const
+void ControlSenderPlugin::getInterfaceVersion(std::string & version) const
+{
+    version = ControlSendVersion;
+}
+
+void ControlSenderPlugin::confirmCommandReady()
+{
+    //todo:implement
+}
+
+void ControlSenderPlugin::confirmRoutingReady()
+{
+    //todo:implement
+}
+
+void ControlSenderPlugin::confirmCommandRundown()
+{
+    //todo:implement
+}
+
+void ControlSenderPlugin::confirmRoutingRundown()
 {
-    return (ControlSendVersion);
+    //todo:implement
 }