diff options
| author | Jens Lorenz <jlorenz@de.adit-jv.com> | 2014-06-11 18:14:58 +0200 |
|---|---|---|
| committer | Christian Linke <christian.linke@bmw.de> | 2014-06-23 14:05:37 +0200 |
| commit | 20491c0f31d70e254c56f171c69b95f3d4ad2813 (patch) | |
| tree | 5409ce980ecf4285a21cf0f1b38ba19dafe3129a /AudioManagerDaemon/test/CAmCommonFunctions.cpp | |
| parent | b0bc6ede2d23dde9a177483aa9470871422fe9aa (diff) | |
| download | audiomanager-20491c0f31d70e254c56f171c69b95f3d4ad2813.tar.gz | |
* Bug #100 - removed projecttypes.h which causes compiling conflicts5.1
Signed-off-by: Jens Lorenz <jlorenz@de.adit-jv.com>
Diffstat (limited to 'AudioManagerDaemon/test/CAmCommonFunctions.cpp')
| -rw-r--r-- | AudioManagerDaemon/test/CAmCommonFunctions.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/AudioManagerDaemon/test/CAmCommonFunctions.cpp b/AudioManagerDaemon/test/CAmCommonFunctions.cpp index d8c2e03..47b09e6 100644 --- a/AudioManagerDaemon/test/CAmCommonFunctions.cpp +++ b/AudioManagerDaemon/test/CAmCommonFunctions.cpp @@ -205,9 +205,9 @@ bool CAmCommonFunctions::compareRoute(am_Route_s a, am_Route_s b) return retVal; } -std::vector<am_ConnectionFormat_e> CAmCommonFunctions::getStandardConnectionFormatList() +std::vector<am_CustomAvailabilityReason_t> CAmCommonFunctions::getStandardConnectionFormatList() { - std::vector<am_ConnectionFormat_e> list; + std::vector<am_CustomAvailabilityReason_t> list; list.push_back(CF_GENIVI_ANALOG); list.push_back(CF_GENIVI_STEREO); return list; @@ -217,10 +217,10 @@ std::vector<am_SoundProperty_s> CAmCommonFunctions::getStandardSoundPropertyList { std::vector<am_SoundProperty_s> soundPropertyList; am_SoundProperty_s soundProperty; - soundProperty.type = SP_EXAMPLE_BASS; + soundProperty.type = SP_GENIVI_BASS; soundProperty.value = 23; soundPropertyList.push_back(soundProperty); - soundProperty.type = SP_EXAMPLE_MID; + soundProperty.type = SP_GENIVI_MID; soundProperty.value = 2; soundPropertyList.push_back(soundProperty); return soundPropertyList; @@ -331,7 +331,7 @@ std::vector<am_NotificationConfiguration_s> am::CAmCommonFunctions::getStandardN am_NotificationConfiguration_s tempNotificationConfiguration; tempNotificationConfiguration.parameter=12; tempNotificationConfiguration.status=NS_PERIODIC; - tempNotificationConfiguration.type=NT_MAX; + tempNotificationConfiguration.type=NT_UNKNOWN; listNotificationConfigurations.push_back(tempNotificationConfiguration); tempNotificationConfiguration.parameter=16; |