From c95cee6a58875f4b9dd69be1d8764bd877ab15a7 Mon Sep 17 00:00:00 2001
From: Christian Linke <christian.linke@bmw.de>
Date: Wed, 26 Jun 2013 18:35:20 +0200
Subject: * corrected private fix for CAmMapHandler

Signed-off-by: Christian Linke <christian.linke@bmw.de>
---
 AudioManagerDaemon/include/CAmMapHandler.h |  3 ++-
 AudioManagerDaemon/src/CAmMapHandler.cpp   | 18 +++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

(limited to 'AudioManagerDaemon')

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;
 }
-- 
cgit v1.2.1