summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Lorenz <jlorenz@de.adit-jv.com>2017-03-14 08:58:49 +0100
committerJens Lorenz <jlorenz@de.adit-jv.com>2017-04-11 21:36:34 +0200
commit698bf42333c7f75873c455cc1321ee722b2771b2 (patch)
tree8fd725f4c80dc9931c99caee4663a3e571146e01
parentb3075389aa61c019fdb5d904abab84532f178250 (diff)
downloadaudiomanager-698bf42333c7f75873c455cc1321ee722b2771b2.tar.gz
AMCore: Start dynamic resources range from DYNAMIC_ID_BOUNDARY
Currently the DYNAMIC_ID_BOUNDARY value is not part of static nor dynamic section. Every element like a source which is registered with this value is not addressable. Signed-off-by: Jens Lorenz <jlorenz@de.adit-jv.com>
-rw-r--r--AudioManagerCore/src/CAmDatabaseHandlerMap.cpp14
-rwxr-xr-xCMakeLists.txt4
2 files changed, 9 insertions, 9 deletions
diff --git a/AudioManagerCore/src/CAmDatabaseHandlerMap.cpp b/AudioManagerCore/src/CAmDatabaseHandlerMap.cpp
index d398a1e..2427630 100644
--- a/AudioManagerCore/src/CAmDatabaseHandlerMap.cpp
+++ b/AudioManagerCore/src/CAmDatabaseHandlerMap.cpp
@@ -639,7 +639,7 @@ bool CAmDatabaseHandlerMap::insertSinkDB(const am_Sink_s & sinkData, am_sinkID_t
am_Error_e CAmDatabaseHandlerMap::enterSinkDB(const am_Sink_s & sinkData, am_sinkID_t & sinkID)
{
- if(sinkData.sinkID>DYNAMIC_ID_BOUNDARY)
+ if(sinkData.sinkID>=DYNAMIC_ID_BOUNDARY)
{
logError(__METHOD_NAME__,"sinkID must be below:",DYNAMIC_ID_BOUNDARY);
return (E_NOT_POSSIBLE);
@@ -734,7 +734,7 @@ bool CAmDatabaseHandlerMap::insertCrossfaderDB(const am_Crossfader_s & crossfade
am_Error_e CAmDatabaseHandlerMap::enterCrossfaderDB(const am_Crossfader_s & crossfaderData, am_crossfaderID_t & crossfaderID)
{
- if(crossfaderData.crossfaderID>DYNAMIC_ID_BOUNDARY)
+ if(crossfaderData.crossfaderID>=DYNAMIC_ID_BOUNDARY)
{
logError(__METHOD_NAME__,"crossfaderID must be below:",DYNAMIC_ID_BOUNDARY);
return (E_NOT_POSSIBLE);
@@ -822,7 +822,7 @@ bool CAmDatabaseHandlerMap::insertGatewayDB(const am_Gateway_s & gatewayData, am
am_Error_e CAmDatabaseHandlerMap::enterGatewayDB(const am_Gateway_s & gatewayData, am_gatewayID_t & gatewayID)
{
- if(gatewayData.gatewayID>DYNAMIC_ID_BOUNDARY)
+ if(gatewayData.gatewayID>=DYNAMIC_ID_BOUNDARY)
{
logError(__METHOD_NAME__,"gatewayID must be below:",DYNAMIC_ID_BOUNDARY);
return (E_NOT_POSSIBLE);
@@ -896,7 +896,7 @@ bool CAmDatabaseHandlerMap::insertConverterDB(const am_Converter_s & converteDat
am_Error_e CAmDatabaseHandlerMap::enterConverterDB(const am_Converter_s & converterData, am_converterID_t & converterID)
{
- if(converterData.converterID>DYNAMIC_ID_BOUNDARY)
+ if(converterData.converterID>=DYNAMIC_ID_BOUNDARY)
{
logError(__METHOD_NAME__,"converterID must be below:",DYNAMIC_ID_BOUNDARY);
return (E_NOT_POSSIBLE);
@@ -1003,7 +1003,7 @@ bool CAmDatabaseHandlerMap::insertSourceDB(const am_Source_s & sourceData, am_so
am_Error_e CAmDatabaseHandlerMap::enterSourceDB(const am_Source_s & sourceData, am_sourceID_t & sourceID)
{
- if(sourceData.sourceID>DYNAMIC_ID_BOUNDARY)
+ if(sourceData.sourceID>=DYNAMIC_ID_BOUNDARY)
{
logError(__METHOD_NAME__,"sourceID must be below:",DYNAMIC_ID_BOUNDARY);
return (E_NOT_POSSIBLE);
@@ -1136,7 +1136,7 @@ bool CAmDatabaseHandlerMap::insertSinkClassDB(const am_SinkClass_s & sinkClass,
am_Error_e CAmDatabaseHandlerMap::enterSinkClassDB(const am_SinkClass_s & sinkClass, am_sinkClass_t & sinkClassID)
{
- if(sinkClass.sinkClassID>DYNAMIC_ID_BOUNDARY)
+ if(sinkClass.sinkClassID>=DYNAMIC_ID_BOUNDARY)
{
logError(__METHOD_NAME__,"sinkClassID must be <",DYNAMIC_ID_BOUNDARY);
return (E_NOT_POSSIBLE);
@@ -1200,7 +1200,7 @@ bool CAmDatabaseHandlerMap::insertSourceClassDB(am_sourceClass_t & sourceClassID
am_Error_e CAmDatabaseHandlerMap::enterSourceClassDB(am_sourceClass_t & sourceClassID, const am_SourceClass_s & sourceClass)
{
- if(sourceClass.sourceClassID>DYNAMIC_ID_BOUNDARY)
+ if(sourceClass.sourceClassID>=DYNAMIC_ID_BOUNDARY)
{
logError(__METHOD_NAME__,"sourceClassID must be <",DYNAMIC_ID_BOUNDARY);
return (E_NOT_POSSIBLE);
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4655a23..33433ee 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -67,8 +67,8 @@ set(DBUS_SERVICE_PREFIX "org.genivi.audiomanager"
set(DBUS_SERVICE_OBJECT_PATH "/org/genivi/audiomanager"
CACHE PROPERTY "The service object path of the AM - only changable for legacy dbus")
-set(DYNAMIC_ID_BOUNDARY 100
- CACHE INTEGER "The ID boundary between static and dynamic ID ranges")
+set(DYNAMIC_ID_BOUNDARY 101
+ CACHE INTEGER "The ID boundary defines the starting point of the dynamic ID range")
set(LIB_INSTALL_SUFFIX "audiomanager"
CACHE STRINGS "The suffix used for installation of the plugins")