summaryrefslogtreecommitdiff
path: root/PluginRoutingInterfaceAsync
diff options
context:
space:
mode:
authorchristian mueller <christian.ei.mueller@bmw.de>2012-02-21 10:46:12 +0100
committerchristian mueller <christian.ei.mueller@bmw.de>2012-02-21 10:46:12 +0100
commit906f202f7663e6c372c192d3bd7015d32a0fbc34 (patch)
treefc4b20038c058098b632e1a2a2f13537244c6e6f /PluginRoutingInterfaceAsync
parentad7b1f5816c6a3bdf2590d52a383f7aa0c52f275 (diff)
downloadaudiomanager-906f202f7663e6c372c192d3bd7015d32a0fbc34.tar.gz
* [GAM-12] Change project types as discussed in the F2F: changed in all tests, updated audiomanagertypes.h and projecttypes.h
* change towards the versioning scheme of the audiomanager in CMakelists.txt
Diffstat (limited to 'PluginRoutingInterfaceAsync')
-rw-r--r--PluginRoutingInterfaceAsync/src/RoutingSenderAsync.cpp14
-rw-r--r--PluginRoutingInterfaceAsync/test/testRoutingInterfaceAsync.cpp30
2 files changed, 22 insertions, 22 deletions
diff --git a/PluginRoutingInterfaceAsync/src/RoutingSenderAsync.cpp b/PluginRoutingInterfaceAsync/src/RoutingSenderAsync.cpp
index 5027452..4993f76 100644
--- a/PluginRoutingInterfaceAsync/src/RoutingSenderAsync.cpp
+++ b/PluginRoutingInterfaceAsync/src/RoutingSenderAsync.cpp
@@ -118,7 +118,7 @@ void* AsyncRoutingSender::InterruptEvents(void *data)
{
am_sourceID_t sourceID;
- am_InterruptState_e state=IS_MIN;
+ am_InterruptState_e state=IS_UNKNOWN;
dbus_message_iter_init(msg, &args);
dbus_message_iter_get_basic(&args,(void*) &sourceID);
reply = dbus_message_new_method_return(msg);
@@ -763,17 +763,17 @@ std::vector<am_Sink_s> AsyncRoutingSender::createSinkTable()
std::vector<am_Sink_s> table;
am_Sink_s item;
am_SoundProperty_s sp;
- sp.type = SP_BASS;
+ sp.type = SP_EXAMPLE_BASS;
sp.value = 0;
std::vector<am_MainSoundProperty_s> listMainSoundProperties;
am_MainSoundProperty_s msp;
- msp.type = MSP_BASS;
+ msp.type = MSP_EXAMPLE_BASS;
msp.value = 5;
listMainSoundProperties.push_back(msp);
- msp.type = MSP_MID;
+ msp.type = MSP_EXAMPLE_MID;
listMainSoundProperties.push_back(msp);
- msp.type = MSP_TREBLE;
+ msp.type = MSP_EXAMPLE_TREBLE;
listMainSoundProperties.push_back(msp);
for (int16_t i = 0; i <= 10; i++)
{
@@ -789,7 +789,7 @@ std::vector<am_Sink_s> AsyncRoutingSender::createSinkTable()
item.listSoundProperties.push_back(sp);
item.listMainSoundProperties = listMainSoundProperties;
item.visible = true;
- item.listConnectionFormats.push_back(CF_ANALOG);
+ item.listConnectionFormats.push_back(CF_GENIVI_ANALOG);
item.muteState = MS_MUTED;
item.mainVolume = 0;
table.push_back(item);
@@ -815,7 +815,7 @@ std::vector<am_Source_s> AsyncRoutingSender::createSourceTable()
item.visible = true;
item.available.availability = A_AVAILABLE;
item.available.availabilityReason = AR_UNKNOWN;
- item.listConnectionFormats.push_back(CF_ANALOG);
+ item.listConnectionFormats.push_back(CF_GENIVI_ANALOG);
table.push_back(item);
}
return (table);
diff --git a/PluginRoutingInterfaceAsync/test/testRoutingInterfaceAsync.cpp b/PluginRoutingInterfaceAsync/test/testRoutingInterfaceAsync.cpp
index c252e07..3149e7e 100644
--- a/PluginRoutingInterfaceAsync/test/testRoutingInterfaceAsync.cpp
+++ b/PluginRoutingInterfaceAsync/test/testRoutingInterfaceAsync.cpp
@@ -132,7 +132,7 @@ TEST_F(testRoutingInterfaceAsync,setSourceSoundProperty)
am_sourceID_t sourceID = 3;
am_SoundProperty_s property;
- property.type = SP_MID;
+ property.type = SP_EXAMPLE_MID;
property.value = 24;
EXPECT_CALL(pReceiveInterface,ackSetSourceSoundProperty(_,E_OK)).Times(1);
@@ -150,7 +150,7 @@ TEST_F(testRoutingInterfaceAsync,setSinkSoundProperty)
am_sinkID_t sinkID = 1;
am_SoundProperty_s property;
- property.type = SP_MID;
+ property.type = SP_EXAMPLE_MID;
property.value = 24;
EXPECT_CALL(pReceiveInterface,ackSetSinkSoundProperty(_,E_OK)).Times(1);
@@ -184,7 +184,7 @@ TEST_F(testRoutingInterfaceAsync,setSourceVolume)
am_sourceID_t sourceID = 3;
am_volume_t volume = 3;
- am_RampType_e ramp = RAMP_DIRECT;
+ am_RampType_e ramp = RAMP_GENIVI_DIRECT;
am_time_t myTime = 25;
EXPECT_CALL(pReceiveInterface,ackSourceVolumeTick(_,sourceID,_)).Times(3);
@@ -203,7 +203,7 @@ TEST_F(testRoutingInterfaceAsync,setSinkVolume)
am_sinkID_t sinkID = 1;
am_volume_t volume = 9;
- am_RampType_e ramp = RAMP_DIRECT;
+ am_RampType_e ramp = RAMP_GENIVI_DIRECT;
am_time_t myTime = 25;
EXPECT_CALL(pReceiveInterface,ackSinkVolumeTick(_,sinkID,_)).Times(9);
@@ -222,7 +222,7 @@ TEST_F(testRoutingInterfaceAsync,setSinkVolumeAbort)
am_sinkID_t sinkID = 2;
am_volume_t volume = 25;
- am_RampType_e ramp = RAMP_DIRECT;
+ am_RampType_e ramp = RAMP_GENIVI_DIRECT;
am_time_t myTime = 25;
EXPECT_CALL(pReceiveInterface, ackSinkVolumeTick(_,sinkID,_));
@@ -244,7 +244,7 @@ TEST_F(testRoutingInterfaceAsync,disconnectTooEarly)
am_connectionID_t connectionID = 4;
am_sourceID_t sourceID = 2;
am_sinkID_t sinkID = 1;
- am_ConnectionFormat_e format = CF_ANALOG;
+ am_ConnectionFormat_e format = CF_GENIVI_ANALOG;
EXPECT_CALL(pReceiveInterface, ackConnect(_,connectionID,E_OK));
EXPECT_CALL(pReceiveInterface,ackDisconnect(_,connectionID,E_OK)).Times(0);
@@ -263,7 +263,7 @@ TEST_F(testRoutingInterfaceAsync,disconnectAbort)
am_connectionID_t connectionID = 4;
am_sourceID_t sourceID = 2;
am_sinkID_t sinkID = 1;
- am_ConnectionFormat_e format = CF_ANALOG;
+ am_ConnectionFormat_e format = CF_GENIVI_ANALOG;
EXPECT_CALL(pReceiveInterface, ackConnect(_,connectionID,E_OK));
EXPECT_CALL(pReceiveInterface, ackDisconnect(_,connectionID,E_ABORTED));
@@ -299,7 +299,7 @@ TEST_F(testRoutingInterfaceAsync,disconnect)
am_connectionID_t connectionID = 4;
am_sourceID_t sourceID = 2;
am_sinkID_t sinkID = 1;
- am_ConnectionFormat_e format = CF_ANALOG;
+ am_ConnectionFormat_e format = CF_GENIVI_ANALOG;
EXPECT_CALL(pReceiveInterface, ackConnect(_,connectionID,E_OK));
EXPECT_CALL(pReceiveInterface, ackDisconnect(_,connectionID,E_OK));
@@ -319,7 +319,7 @@ TEST_F(testRoutingInterfaceAsync,connectNoMoreThreads)
am_connectionID_t connectionID = 1;
am_sourceID_t sourceID = 2;
am_sinkID_t sinkID = 1;
- am_ConnectionFormat_e format = CF_ANALOG;
+ am_ConnectionFormat_e format = CF_GENIVI_ANALOG;
EXPECT_CALL(pReceiveInterface,ackConnect(_,_,E_OK)).Times(10);
for (int i = 0; i < 10; i++)
@@ -341,7 +341,7 @@ TEST_F(testRoutingInterfaceAsync,connectAbortTooLate)
am_connectionID_t connectionID = 4;
am_sourceID_t sourceID = 2;
am_sinkID_t sinkID = 1;
- am_ConnectionFormat_e format = CF_ANALOG;
+ am_ConnectionFormat_e format = CF_GENIVI_ANALOG;
EXPECT_CALL(pReceiveInterface,ackConnect(_,connectionID,E_OK)).Times(1);
ASSERT_EQ(E_OK, pRoutingSender.asyncConnect(handle,connectionID,sourceID,sinkID,format));
@@ -360,7 +360,7 @@ TEST_F(testRoutingInterfaceAsync,connectAbort)
am_connectionID_t connectionID = 4;
am_sourceID_t sourceID = 2;
am_sinkID_t sinkID = 1;
- am_ConnectionFormat_e format = CF_ANALOG;
+ am_ConnectionFormat_e format = CF_GENIVI_ANALOG;
EXPECT_CALL(pReceiveInterface,ackConnect(_,connectionID,E_ABORTED)).Times(1);
ASSERT_EQ(E_OK, pRoutingSender.asyncConnect(handle,connectionID,sourceID,sinkID,format));
@@ -379,7 +379,7 @@ TEST_F(testRoutingInterfaceAsync,connectWrongFormat)
am_connectionID_t connectionID = 4;
am_sourceID_t sourceID = 2;
am_sinkID_t sinkID = 1;
- am_ConnectionFormat_e format = CF_MONO;
+ am_ConnectionFormat_e format = CF_GENIVI_MONO;
EXPECT_CALL(pReceiveInterface,ackConnect(_,connectionID,E_OK)).Times(0);
ASSERT_EQ(E_WRONG_FORMAT, pRoutingSender.asyncConnect(handle,connectionID,sourceID,sinkID,format));
@@ -396,7 +396,7 @@ TEST_F(testRoutingInterfaceAsync,connectWrongSink)
am_connectionID_t connectionID = 4;
am_sourceID_t sourceID = 2;
am_sinkID_t sinkID = 122;
- am_ConnectionFormat_e format = CF_ANALOG;
+ am_ConnectionFormat_e format = CF_GENIVI_ANALOG;
EXPECT_CALL(pReceiveInterface,ackConnect(_,connectionID,E_OK)).Times(0);
ASSERT_EQ(E_NON_EXISTENT, pRoutingSender.asyncConnect(handle,connectionID,sourceID,sinkID,format));
@@ -412,7 +412,7 @@ TEST_F(testRoutingInterfaceAsync,connectWrongSource)
am_connectionID_t connectionID = 4;
am_sourceID_t sourceID = 25;
am_sinkID_t sinkID = 1;
- am_ConnectionFormat_e format = CF_ANALOG;
+ am_ConnectionFormat_e format = CF_GENIVI_ANALOG;
EXPECT_CALL(pReceiveInterface,ackConnect(_,connectionID,E_OK)).Times(0);
ASSERT_EQ(E_NON_EXISTENT, pRoutingSender.asyncConnect(handle,connectionID,sourceID,sinkID,format));
@@ -429,7 +429,7 @@ TEST_F(testRoutingInterfaceAsync,connect)
am_connectionID_t connectionID = 4;
am_sourceID_t sourceID = 2;
am_sinkID_t sinkID = 1;
- am_ConnectionFormat_e format = CF_ANALOG;
+ am_ConnectionFormat_e format = CF_GENIVI_ANALOG;
EXPECT_CALL(pReceiveInterface, ackConnect(_,connectionID,E_OK));
ASSERT_EQ(E_OK, pRoutingSender.asyncConnect(handle,connectionID,sourceID,sinkID,format));