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/AmRoutingInterfaceTest | |
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/AmRoutingInterfaceTest')
-rw-r--r-- | AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.cpp b/AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.cpp index d3415c4..42ef261 100644 --- a/AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.cpp +++ b/AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.cpp @@ -142,7 +142,7 @@ TEST_F(CAmRoutingInterfaceTest,setSinkSoundPropertyNoChange) am_domainID_t domainID; am_Handle_s handle; am_SoundProperty_s soundProperty; - soundProperty.type = SP_EXAMPLE_TREBLE; + soundProperty.type = SP_GENIVI_TREBLE; soundProperty.value = 23; std::vector<am_Handle_s> listHandles; pCF.createSink(sink); @@ -215,7 +215,7 @@ TEST_F(CAmRoutingInterfaceTest,setSinkSoundProperty) am_Handle_s handle; am_SoundProperty_s soundProperty; soundProperty.value=5; - soundProperty.type=SP_EXAMPLE_MID; + soundProperty.type=SP_GENIVI_MID; std::vector<am_Handle_s> listHandles; pCF.createSink(sink); pCF.createDomain(domain); @@ -244,7 +244,7 @@ TEST_F(CAmRoutingInterfaceTest,setSourceVolumeNoChange) am_domainID_t domainID; am_Handle_s handle; am_volume_t volume = 34; - am_RampType_e rampType = RAMP_GENIVI_DIRECT; + am_CustomRampType_t rampType = RAMP_GENIVI_DIRECT; am_time_t rampTime = 300; std::vector<am_Handle_s> listHandles; pCF.createSource(source); @@ -270,7 +270,7 @@ TEST_F(CAmRoutingInterfaceTest,setSourceVolume) am_domainID_t domainID; am_Handle_s handle; am_volume_t volume = 34; - am_RampType_e rampType = RAMP_GENIVI_DIRECT; + am_CustomRampType_t rampType = RAMP_GENIVI_DIRECT; am_time_t rampTime = 300; std::vector<am_Handle_s> listHandles; pCF.createSource(source); @@ -298,7 +298,7 @@ TEST_F(CAmRoutingInterfaceTest,setSinkVolumeNoChange) am_domainID_t domainID; am_Handle_s handle; am_volume_t volume = 34; - am_RampType_e rampType = RAMP_GENIVI_DIRECT; + am_CustomRampType_t rampType = RAMP_GENIVI_DIRECT; am_time_t rampTime = 300; std::vector<am_Handle_s> listHandles; pCF.createSink(sink); @@ -324,7 +324,7 @@ TEST_F(CAmRoutingInterfaceTest,setSinkVolume) am_domainID_t domainID; am_Handle_s handle; am_volume_t volume = 34; - am_RampType_e rampType = RAMP_GENIVI_DIRECT; + am_CustomRampType_t rampType = RAMP_GENIVI_DIRECT; am_time_t rampTime = 300; std::vector<am_Handle_s> listHandles; pCF.createSink(sink); |