diff options
author | christian mueller <christian.ei.mueller@bmw.de> | 2012-01-10 15:58:38 +0100 |
---|---|---|
committer | christian mueller <christian.ei.mueller@bmw.de> | 2012-01-12 00:09:34 +0100 |
commit | 472d0762b68ce0f2a755b4215515a3e031831495 (patch) | |
tree | 276e811f00dfe17cba15c56092b33d67ba2793f6 /PluginControlInterface | |
parent | 6ebae8c4d3a340c135ed2f5f611a0e1c31994164 (diff) | |
download | audiomanager-472d0762b68ce0f2a755b4215515a3e031831495.tar.gz |
* recreated the header files out of the model. Added versioning support in the headerfiles generated
* ensured compatibility with 64 bit systems while compiling dbus [ changed FindDBUS.cmake]
* updated the README to better support building
* updated typo in introspectable string of DBusWrapper
* reworked including strategie
* added getInterfafeVersion method on all interfaces
* added Interface Versioning support
* added version as part of .so ending
* it is no possible to set a vector of source and sink sound properties at a time
* added interface to ask for all loaded plugins on RoutingSender
* added first version of telnet server (not yet productive) - set to not active in CMakeLists.txt
* added changelog (created out of git commit log)
* added default values for all enum types to be save even on other if communication is on other domain
Diffstat (limited to 'PluginControlInterface')
-rw-r--r-- | PluginControlInterface/CMakeLists.txt | 10 | ||||
-rw-r--r-- | PluginControlInterface/include/ControlSender.h | 4 | ||||
-rw-r--r-- | PluginControlInterface/src/ControlSender.cpp | 15 |
3 files changed, 27 insertions, 2 deletions
diff --git a/PluginControlInterface/CMakeLists.txt b/PluginControlInterface/CMakeLists.txt index 4ccb6ac..46d818a 100644 --- a/PluginControlInterface/CMakeLists.txt +++ b/PluginControlInterface/CMakeLists.txt @@ -4,11 +4,15 @@ PROJECT(PluginControlInterface) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -DDLT_CONTEXT=ControlPluginDbus") - set(LIBRARY_OUTPUT_PATH ${PLUGINS_OUTPUT_PATH}/control) set(DOC_OUTPUT_PATH ${DOC_OUTPUT_PATH}/ControlPlugin) set(INCLUDES_FOLDER "include") +FILE(READ "${AUDIO_INCLUDES_FOLDER}/control/ControlSendInterface.h" VERSION_BUFFER LIMIT 6000) +STRING(REGEX MATCH "ControlSendVersion*.[^0-9]*[0-9]" LIB_INTERFACE_VERSION_STRING ${VERSION_BUFFER}) +STRING(REGEX REPLACE "[^0-9]" "" LIB_INTERFACE_VERSION ${LIB_INTERFACE_VERSION_STRING}) +MESSAGE(STATUS "Building against control interface version ${LIB_INTERFACE_VERSION}") + INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} ${STD_INCLUDE_DIRS} @@ -22,6 +26,10 @@ file(GLOB PLUGIN_CONTROL_SRCS_CXX "src/*.cpp") add_library(PluginControlInterface SHARED ${PLUGIN_CONTROL_SRCS_CXX}) +SET_TARGET_PROPERTIES(PluginControlInterface PROPERTIES + SOVERSION "${LIB_INTERFACE_VERSION}" +) + TARGET_LINK_LIBRARIES(PluginControlInterface ${DLT_LIBRARIES}) diff --git a/PluginControlInterface/include/ControlSender.h b/PluginControlInterface/include/ControlSender.h index 8945d39..d0014a4 100644 --- a/PluginControlInterface/include/ControlSender.h +++ b/PluginControlInterface/include/ControlSender.h @@ -28,7 +28,6 @@ #define CONTROLSENDER_H_ #include <control/ControlSendInterface.h> -#include <control/ControlReceiveInterface.h> using namespace am; @@ -74,7 +73,10 @@ public: 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 cbAckSetSinkSoundProperties(const am_Handle_s handle, const am_Error_e error) ; + uint16_t getInterfaceVersion() const; }; #endif /* CONTROLSENDER_H_ */ diff --git a/PluginControlInterface/src/ControlSender.cpp b/PluginControlInterface/src/ControlSender.cpp index f5d1720..fb54c8c 100644 --- a/PluginControlInterface/src/ControlSender.cpp +++ b/PluginControlInterface/src/ControlSender.cpp @@ -300,5 +300,20 @@ void ControlSenderPlugin::cbAckSetSinkSoundProperty(const am_Handle_s handle, co { } +void ControlSenderPlugin::cbAckSetSourceSoundProperties(const am_Handle_s handle, const am_Error_e error) +{ +} + +void ControlSenderPlugin::cbAckSetSinkSoundProperties(const am_Handle_s handle, const am_Error_e error) +{ +} + +uint16_t ControlSenderPlugin::getInterfaceVersion() const +{ + return (ControlSendVersion); +} + + + |