summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Linke <christian.linke@bmw.de>2013-06-26 18:35:20 +0200
committerChristian Linke <christian.linke@bmw.de>2013-06-26 18:35:20 +0200
commitc95cee6a58875f4b9dd69be1d8764bd877ab15a7 (patch)
tree1d1944f7446aab775cf8ada45e71d1476c0e87d2
parentefd0872cbb07b975e19717b35ab1e4ea7ab1b6ec (diff)
downloadaudiomanager-c95cee6a58875f4b9dd69be1d8764bd877ab15a7.tar.gz
* corrected private fix for CAmMapHandler
Signed-off-by: Christian Linke <christian.linke@bmw.de>
-rw-r--r--AudioManagerDaemon/include/CAmMapHandler.h3
-rw-r--r--AudioManagerDaemon/src/CAmMapHandler.cpp18
2 files changed, 11 insertions, 10 deletions
diff --git a/AudioManagerDaemon/include/CAmMapHandler.h b/AudioManagerDaemon/include/CAmMapHandler.h
index feea38c..47bd0ec 100644
--- a/AudioManagerDaemon/include/CAmMapHandler.h
+++ b/AudioManagerDaemon/include/CAmMapHandler.h
@@ -162,7 +162,6 @@ public:
void printSinks();
void printSinkClasses();
void printSourceClasses();
-private:
/**
* The following structures extend the base structures with the field 'reserved'.
@@ -310,6 +309,8 @@ private:
};
};
+ private:
+
typedef std::map<am_domainID_t, am_Domain_Database_s> CAmMapDomain;
typedef std::map<am_sourceClass_t, am_SourceClass_s> CAmMapSourceClass;
typedef std::map<am_sinkClass_t, am_SinkClass_s> CAmMapSinkClass;
diff --git a/AudioManagerDaemon/src/CAmMapHandler.cpp b/AudioManagerDaemon/src/CAmMapHandler.cpp
index 332e533..a70e636 100644
--- a/AudioManagerDaemon/src/CAmMapHandler.cpp
+++ b/AudioManagerDaemon/src/CAmMapHandler.cpp
@@ -74,12 +74,12 @@ TMapObjectType const * findFirstObjectMatchingCriteria(const std::map<TMapKeyTyp
bool compareSinkObjectByName(const void *anObject, const void *aValue, void *)
{
- return (anObject && aValue)?((const std::string *)aValue)->compare(((const am_Sink_Database_s *)anObject)->name)==0:false;
+ return (anObject && aValue)?((const std::string *)aValue)->compare(((const CAmMapHandler::am_Sink_Database_s *)anObject)->name)==0:false;
}
bool compareSourceObjectByName(const void *anObject, const void *aValue, void *)
{
- return (anObject && aValue)?((const std::string *)aValue)->compare(((const am_Source_Database_s *)anObject)->name)==0:false;
+ return (anObject && aValue)?((const std::string *)aValue)->compare(((const CAmMapHandler::am_Source_Database_s *)anObject)->name)==0:false;
}
bool compareSinkClassObjectByName(const void *anObject, const void *aValue, void *)
@@ -102,7 +102,7 @@ bool compareSinkObjectByNameAndFlag(const void *anObject, const void *aValue, vo
if(anObject && aValue)
{
bool flag = (contextOrNull!=NULL)?*((bool*)contextOrNull):true;
- return flag==((const am_Sink_Database_s *)anObject)->reserved &&
+ return flag==((const CAmMapHandler::am_Sink_Database_s *)anObject)->reserved &&
((const std::string *)aValue)->compare(((const am_Sink_s *)anObject)->name)==0;
}
return false;
@@ -112,10 +112,10 @@ bool compareConnectionObjectsWithObject(const void *anObject, const void *aValue
{
if(anObject && aValue)
{
- return 0==((const am_Connection_Database_s *)anObject)->reserved &&
- ((const am_Connection_Database_s *)aValue)->sinkID == ((const am_Connection_Database_s *)anObject)->sinkID &&
- ((const am_Connection_Database_s *)aValue)->sourceID == ((const am_Connection_Database_s *)anObject)->sourceID &&
- ((const am_Connection_Database_s *)aValue)->connectionFormat == ((const am_Connection_Database_s *)anObject)->connectionFormat;
+ return 0==((const CAmMapHandler::am_Connection_Database_s *)anObject)->reserved &&
+ ((const CAmMapHandler::am_Connection_Database_s *)aValue)->sinkID == ((const CAmMapHandler::am_Connection_Database_s *)anObject)->sinkID &&
+ ((const CAmMapHandler::am_Connection_Database_s *)aValue)->sourceID == ((const CAmMapHandler::am_Connection_Database_s *)anObject)->sourceID &&
+ ((const CAmMapHandler::am_Connection_Database_s *)aValue)->connectionFormat == ((const CAmMapHandler::am_Connection_Database_s *)anObject)->connectionFormat;
}
return false;
}
@@ -125,8 +125,8 @@ bool compareSourceObjectsByNameAndFlag(const void *anObject, const void *aValue,
if(anObject && aValue)
{
bool flag = (contextOrNull!=NULL)?*((bool*)contextOrNull):true;
- return flag==((const am_Source_Database_s *)anObject)->reserved &&
- ((const std::string *)aValue)->compare(((const am_Source_Database_s *)anObject)->name)==0;
+ return flag==((const CAmMapHandler::am_Source_Database_s *)anObject)->reserved &&
+ ((const std::string *)aValue)->compare(((const CAmMapHandler::am_Source_Database_s *)anObject)->name)==0;
}
return false;
}