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 /PluginRoutingInterfaceDbus | |
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 'PluginRoutingInterfaceDbus')
-rw-r--r-- | PluginRoutingInterfaceDbus/CMakeLists.txt | 9 | ||||
-rw-r--r-- | PluginRoutingInterfaceDbus/include/RoutingSender.h | 3 | ||||
-rw-r--r-- | PluginRoutingInterfaceDbus/src/RoutingSender.cpp | 17 |
3 files changed, 29 insertions, 0 deletions
diff --git a/PluginRoutingInterfaceDbus/CMakeLists.txt b/PluginRoutingInterfaceDbus/CMakeLists.txt index a50936c..6f36ff1 100644 --- a/PluginRoutingInterfaceDbus/CMakeLists.txt +++ b/PluginRoutingInterfaceDbus/CMakeLists.txt @@ -8,6 +8,11 @@ set(LIBRARY_OUTPUT_PATH ${PLUGINS_OUTPUT_PATH}/routing) set(DOC_OUTPUT_PATH ${DOC_OUTPUT_PATH}/RoutingPlugin) set(INCLUDES_FOLDER "include") +FILE(READ "${AUDIO_INCLUDES_FOLDER}/routing/RoutingSendInterface.h" VERSION_BUFFER LIMIT 6000) +STRING(REGEX MATCH "RoutingSendVersion*.[^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 routing interface version ${LIB_INTERFACE_VERSION}") + FIND_PACKAGE(DBUS REQUIRED) INCLUDE_DIRECTORIES( @@ -25,6 +30,10 @@ file(GLOB PLUGINDBUS_SRCS_CXX "src/*.cpp") add_library(PluginRoutingInterfaceDbus SHARED ${PLUGINDBUS_SRCS_CXX}) +SET_TARGET_PROPERTIES(PluginRoutingInterfaceDbus PROPERTIES + SOVERSION "${LIB_INTERFACE_VERSION}" +) + TARGET_LINK_LIBRARIES(PluginRoutingInterfaceDbus ${DLT_LIBRARIES} ${DBUS_LIBRARY} diff --git a/PluginRoutingInterfaceDbus/include/RoutingSender.h b/PluginRoutingInterfaceDbus/include/RoutingSender.h index f394644..e8dd9ba 100644 --- a/PluginRoutingInterfaceDbus/include/RoutingSender.h +++ b/PluginRoutingInterfaceDbus/include/RoutingSender.h @@ -44,10 +44,13 @@ public: 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_SoundProperty_s& soundProperty, const am_sinkID_t sinkID) ; + am_Error_e asyncSetSinkSoundProperties(const am_Handle_s handle, const std::vector<am_SoundProperty_s>& listSoundProperties, const am_sinkID_t sinkID) ; am_Error_e asyncSetSourceSoundProperty(const am_Handle_s handle, const am_SoundProperty_s& soundProperty, const am_sourceID_t sourceID) ; + am_Error_e asyncSetSourceSoundProperties(const am_Handle_s handle, const std::vector<am_SoundProperty_s>& listSoundProperties, const am_sourceID_t sourceID) ; 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 ; }; #endif /* ROUTINGSENDER_H_ */ diff --git a/PluginRoutingInterfaceDbus/src/RoutingSender.cpp b/PluginRoutingInterfaceDbus/src/RoutingSender.cpp index e477997..e93d921 100644 --- a/PluginRoutingInterfaceDbus/src/RoutingSender.cpp +++ b/PluginRoutingInterfaceDbus/src/RoutingSender.cpp @@ -129,6 +129,23 @@ am_Error_e DbusRoutingSender::returnBusName(std::string & BusName) const return (E_OK); } +am_Error_e DbusRoutingSender::asyncSetSinkSoundProperties(const am_Handle_s handle, const std::vector<am_SoundProperty_s> & listSoundProperties, const am_sinkID_t sinkID) +{ + +} + +am_Error_e DbusRoutingSender::asyncSetSourceSoundProperties(const am_Handle_s handle, const std::vector<am_SoundProperty_s> & listSoundProperties, const am_sourceID_t sourceID) +{ + +} + +uint16_t DbusRoutingSender::getInterfaceVersion() const +{ + return (RoutingSendVersion); +} + + + |