diff options
-rwxr-xr-x | CMakeLists.txt | 13 | ||||
-rw-r--r-- | VERSION | 2 | ||||
-rw-r--r-- | cmake/audiomanagerconfig.h.in | 2 | ||||
-rw-r--r-- | include/IAmControl.h | 2 |
4 files changed, 16 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8bfc7c6..ca4cbda 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,6 +49,9 @@ option( WITH_DOCUMENTATION option ( WITH_SYSTEMD_WATCHDOG "Build with systemD support & watchdog" ON) +option ( WITH_DATABASE_CHANGE_CHECK + "Allow reduced communication traffic by returning E_NO_CHANGE instead of E_OK to some controller-side functions" OFF) + option ( GLIB_DBUS_TYPES_TOLERANT "Build dbus with tolerance towards glib 16bit/32bit handling" ON) @@ -97,6 +100,12 @@ set(AM_MAX_CONNECTIONS 0x1000 set(AM_MAX_MAIN_CONNECTIONS 0x1000 CACHE INTEGER "Number of max Mainconnections before rollover") +set(MAX_ROUTING_PATHS 5 + CACHE INTEGER "Max paths count returned to the controller (default: 5)") + +set(MAX_ALLOWED_DOMAIN_CYCLES 1 + CACHE INTEGER "How many times the routing algorithm should look back into domains (0 = disallowed, 1 = single = default, ..., UINT_MAX = unlimited).") + set(AUDIOMANGER_APP_ID "AUDI" CACHE PROPERTY "The application ID that is used by the audiomanager") @@ -217,10 +226,10 @@ message(STATUS "${PROJECT_NAME} Configuration:") message(STATUS "CMAKE_BUILD_TYPE = ${CMAKE_BUILD_TYPE}") message(STATUS "CMAKE_INSTALL_PREFIX = ${CMAKE_INSTALL_PREFIX}") message(STATUS "BUILD_DOCUMENTATION = ${WITH_DOCUMENTATION}") -message(STATUS "WITH_TESTS = ${WITH_TESTS}") message(STATUS "WITH_DLT = ${WITH_DLT}") message(STATUS "WITH_TESTS = ${WITH_TESTS}") message(STATUS "WITH_SYSTEMD_WATCHDOG = ${WITH_SYSTEMD_WATCHDOG}") +message(STATUS "WITH_DATABASE_CHANGE_CHECK = ${WITH_DATABASE_CHANGE_CHECK}") message(STATUS "WITH_CAPI_WRAPPER = ${WITH_CAPI_WRAPPER}") message(STATUS "WITH_DBUS_WRAPPER = ${WITH_DBUS_WRAPPER}") message(STATUS "WITH_SHARED_UTILITIES = ${WITH_SHARED_UTILITIES}") @@ -237,6 +246,8 @@ message(STATUS "AM_SHARE_FOLDER = ${AM_SHARE_FOLDER}") message(STATUS "AM_MAP_CAPACITY = ${AM_MAP_CAPACITY}") message(STATUS "AM_MAX_CONNECTIONS = ${AM_MAX_CONNECTIONS}") message(STATUS "AM_MAX_MAIN_CONNECTIONS = ${AM_MAX_MAIN_CONNECTIONS}") +message(STATUS "MAX_ROUTING_PATHS = ${MAX_ROUTING_PATHS}") +message(STATUS "MAX_ALLOWED_DOMAIN_CYCLES = ${MAX_ALLOWED_DOMAIN_CYCLES}") message(STATUS "BUILD_TESTING = ${BUILD_TESTING}") message(STATUS "CMAKE_INSTALL_DOCDIR = ${CMAKE_INSTALL_DOCDIR}") message(STATUS "AUDIOMANGER_APP_ID = ${AUDIOMANGER_APP_ID}") @@ -1 +1 @@ -7.7.1
\ No newline at end of file +7.8.0
\ No newline at end of file diff --git a/cmake/audiomanagerconfig.h.in b/cmake/audiomanagerconfig.h.in index de45077..cde4f88 100644 --- a/cmake/audiomanagerconfig.h.in +++ b/cmake/audiomanagerconfig.h.in @@ -31,6 +31,8 @@ #cmakedefine AM_MAP_CAPACITY @AM_MAP_CAPACITY@ #cmakedefine AM_MAX_CONNECTIONS @AM_MAX_CONNECTIONS@ #cmakedefine AM_MAX_MAIN_CONNECTIONS @AM_MAX_MAIN_CONNECTIONS@ +#cmakedefine MAX_ROUTING_PATHS @MAX_ROUTING_PATHS@ +#cmakedefine MAX_ALLOWED_DOMAIN_CYCLES @MAX_ALLOWED_DOMAIN_CYCLES@ #cmakedefine LIB_COMMAND_INTERFACE_VERSION @LIB_COMMAND_INTERFACE_VERSION@ #cmakedefine LIB_CONTROL_INTERFACE_VERSION @LIB_CONTROL_INTERFACE_VERSION@ #cmakedefine LIB_ROUTING_INTERFACE_VERSION @LIB_ROUTING_INTERFACE_VERSION@ diff --git a/include/IAmControl.h b/include/IAmControl.h index 82dad97..32008a0 100644 --- a/include/IAmControl.h +++ b/include/IAmControl.h @@ -32,7 +32,7 @@ class CAmSocketHandler; #include "audiomanagertypes.h"
-#define ControlVersion "5.2"
+#define ControlVersion "5.3"
namespace am {
/**
|