From 7ba5224b44b63e414eb51d8064050085a4bfb407 Mon Sep 17 00:00:00 2001 From: Christian Linke Date: Wed, 19 Mar 2014 15:06:12 +0100 Subject: * some adoptions Signed-off-by: Christian Linke --- .../test/CAmRoutingInterfaceCAPITests.cpp | 12 ++++++------ include/shared/CAmDltWrapper.h | 2 ++ include/shared/CAmSerializer.h | 1 - 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/PluginRoutingInterfaceCAPI/test/CAmRoutingInterfaceCAPITests.cpp b/PluginRoutingInterfaceCAPI/test/CAmRoutingInterfaceCAPITests.cpp index 3bf118d..7238dc2 100644 --- a/PluginRoutingInterfaceCAPI/test/CAmRoutingInterfaceCAPITests.cpp +++ b/PluginRoutingInterfaceCAPI/test/CAmRoutingInterfaceCAPITests.cpp @@ -69,7 +69,7 @@ void initSink(org::genivi::am::am_Sink_s & newSink, am_Sink_s & newAmSink, const org::genivi::am::am_MuteState_e muteState = org::genivi::am::am_MuteState_e::MS_UNKNOWN; org::genivi::am::am_Availability_s available(org::genivi::am::am_Availability_e::A_MAX, static_cast(AR_MAX)); org::genivi::am::am_SoundProperty_L listSoundProperties; - listSoundProperties.push_back(org::genivi::am::am_SoundProperty_s(static_cast(SP_INTERR_OVERLAYID), 100)); + listSoundProperties.push_back(org::genivi::am::am_SoundProperty_s(static_cast(SP_INPUTB), 100)); listSoundProperties.push_back(org::genivi::am::am_SoundProperty_s(static_cast(SP_EXAMPLE_BASS), 101)); listSoundProperties.push_back(org::genivi::am::am_SoundProperty_s(static_cast(SP_MAX), 102)); org::genivi::am::am_ConnectionFormat_L listConnectionFormats; @@ -95,7 +95,7 @@ void initSource(org::genivi::am::am_Source_s & newSource, am_Source_s & newAmSou org::genivi::am::am_SourceState_e srcState = org::genivi::am::am_SourceState_e::SS_MAX; org::genivi::am::am_Availability_s available(org::genivi::am::am_Availability_e::A_MAX, static_cast(AR_MAX)); org::genivi::am::am_SoundProperty_L listSoundProperties; - listSoundProperties.push_back(org::genivi::am::am_SoundProperty_s(static_cast(SP_INTERR_OVERLAYID), 100)); + listSoundProperties.push_back(org::genivi::am::am_SoundProperty_s(static_cast(SP_INPUTB), 100)); listSoundProperties.push_back(org::genivi::am::am_SoundProperty_s(static_cast(SP_EXAMPLE_BASS), 101)); listSoundProperties.push_back(org::genivi::am::am_SoundProperty_s(static_cast(SP_MAX), 102)); org::genivi::am::am_ConnectionFormat_L listConnectionFormats; @@ -1913,7 +1913,7 @@ TEST_F(CAmRoutingSenderCAPITests, TestDomain_asyncSetSinkSoundProperties) am_SourceState_e state = am_SourceState_e::SS_MAX; std::vector listSoundProperties; - listSoundProperties.push_back((am_SoundProperty_s){am_SoundPropertyType_e::SP_INTERR_OVERLAYID, 100}); + listSoundProperties.push_back((am_SoundProperty_s){am_SoundPropertyType_e::SP_INPUTB, 100}); listSoundProperties.push_back((am_SoundProperty_s){am_SoundPropertyType_e::SP_MAX, 101}); listSoundProperties.push_back((am_SoundProperty_s){am_SoundPropertyType_e::SP_PRIORITY, 100}); @@ -1942,7 +1942,7 @@ TEST_F(CAmRoutingSenderCAPITests, TestDomain_asyncSetSinkSoundProperty) am_SourceState_e state = am_SourceState_e::SS_MAX; EXPECT_CALL(*env->mpRoutingReceive, ackSetSinkSoundProperty(IsHandleEqual(handle), E_OK)).Times(1); - am_Error_e error = env->mpPlugin->asyncSetSinkSoundProperty(handle, sID, (am_SoundProperty_s){am_SoundPropertyType_e::SP_INTERR_OVERLAYID, 100}); + am_Error_e error = env->mpPlugin->asyncSetSinkSoundProperty(handle, sID, (am_SoundProperty_s){am_SoundPropertyType_e::SP_INPUTB, 100}); usleep(50000); ASSERT_EQ( error, E_OK ); ASSERT_FALSE( backdoor.containsHandle( handle.handle) ); @@ -1966,7 +1966,7 @@ TEST_F(CAmRoutingSenderCAPITests, TestDomain_asyncSetSourceSoundProperties) am_SourceState_e state = am_SourceState_e::SS_MAX; std::vector listSoundProperties; - listSoundProperties.push_back((am_SoundProperty_s){am_SoundPropertyType_e::SP_INTERR_OVERLAYID, 100}); + listSoundProperties.push_back((am_SoundProperty_s){am_SoundPropertyType_e::SP_INPUTB, 100}); listSoundProperties.push_back((am_SoundProperty_s){am_SoundPropertyType_e::SP_MAX, 101}); listSoundProperties.push_back((am_SoundProperty_s){am_SoundPropertyType_e::SP_PRIORITY, 100}); @@ -1995,7 +1995,7 @@ TEST_F(CAmRoutingSenderCAPITests, TestDomain_asyncSetSourceSoundProperty) am_SourceState_e state = am_SourceState_e::SS_MAX; EXPECT_CALL(*env->mpRoutingReceive, ackSetSourceSoundProperty(IsHandleEqual(handle), E_OK)).Times(1); - am_Error_e error = env->mpPlugin->asyncSetSourceSoundProperty(handle, sID, (am_SoundProperty_s){am_SoundPropertyType_e::SP_INTERR_OVERLAYID, 100}); + am_Error_e error = env->mpPlugin->asyncSetSourceSoundProperty(handle, sID, (am_SoundProperty_s){am_SoundPropertyType_e::SP_INPUTB, 100}); usleep(50000); ASSERT_EQ( error, E_OK ); ASSERT_FALSE( backdoor.containsHandle( handle.handle) ); diff --git a/include/shared/CAmDltWrapper.h b/include/shared/CAmDltWrapper.h index 9eae51e..410acce 100644 --- a/include/shared/CAmDltWrapper.h +++ b/include/shared/CAmDltWrapper.h @@ -22,6 +22,7 @@ #include "config.h" #include #include +#include "audiomanagertypes.h" #ifdef WITH_DLT #include @@ -108,6 +109,7 @@ public: void append(const char*& value); void append(const std::string& value); void append(const bool value); + void append(am_Error_e value); #ifndef WITH_DLT void enableNoDLTDebug(const bool enableNoDLTDebug = true); #endif diff --git a/include/shared/CAmSerializer.h b/include/shared/CAmSerializer.h index 1cfbcc8..ff131d4 100644 --- a/include/shared/CAmSerializer.h +++ b/include/shared/CAmSerializer.h @@ -995,7 +995,6 @@ public: template void asyncCall(TClass1* instance, void (TClass1::*function)(Targ argument, Targ1 argument1), Targ argument, Targ1 argument1) { - logInfo("took without ref"); CAmDelegagePtr p(new CAmTwoArgDelegate(instance, function, argument, argument1)); send(p); } -- cgit v1.2.1