diff options
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | AudioManagerDaemon/src/ControlReceiver.cpp | 2 | ||||
| -rw-r--r-- | AudioManagerDaemon/src/DatabaseHandler.cpp | 42 | ||||
| -rw-r--r-- | AudioManagerDaemon/test/CommonFunctions.cpp | 18 | ||||
| -rw-r--r-- | AudioManagerDaemon/test/controlInterface/controlInterfaceTest.cpp | 34 | ||||
| -rw-r--r-- | AudioManagerDaemon/test/database/databaseTest.cpp | 66 | ||||
| -rw-r--r-- | AudioManagerDaemon/test/routing/routingTest.cpp | 164 | ||||
| -rw-r--r-- | AudioManagerDaemon/test/routingInterface/routingInterfaceTest.cpp | 28 | ||||
| -rw-r--r-- | CHANGELOG | 563 | ||||
| -rw-r--r-- | CMakeLists.txt | 5 | ||||
| -rw-r--r-- | PluginCommandInterfaceDbus/test/dbuscommandpluginInterfaceTest.cpp | 22 | ||||
| -rw-r--r-- | PluginCommandInterfaceDbus/test/dbuscommaninterfacesignalsTest.cpp | 18 | ||||
| -rw-r--r-- | PluginControlInterface/src/ControlSender.cpp | 4 | ||||
| -rw-r--r-- | PluginRoutingInterfaceAsync/src/RoutingSenderAsync.cpp | 14 | ||||
| -rw-r--r-- | PluginRoutingInterfaceAsync/test/testRoutingInterfaceAsync.cpp | 30 | ||||
| -rw-r--r-- | includes/audiomanagertypes.h | 304 | ||||
| -rw-r--r-- | includes/config.h | 25 | ||||
| -rw-r--r-- | includes/projecttypes.h | 160 |
18 files changed, 537 insertions, 966 deletions
@@ -1,8 +1,8 @@ +CHANGELOG +config.h bin/ build/ doc/ packages/ .* -CHANGELOG -includes/config.h diff --git a/AudioManagerDaemon/src/ControlReceiver.cpp b/AudioManagerDaemon/src/ControlReceiver.cpp index b352d0d..7909851 100644 --- a/AudioManagerDaemon/src/ControlReceiver.cpp +++ b/AudioManagerDaemon/src/ControlReceiver.cpp @@ -207,7 +207,7 @@ am_Error_e ControlReceiver::setDomainState(const am_domainID_t domainID, const a { logInfo("ControlReceiver::setDomainState got called, domainID=", domainID, "domainState=", domainState); - am_DomainState_e tempState = DS_MIN; + am_DomainState_e tempState = DS_UNKNOWN; if (mDatabaseHandler->getDomainState(domainID, tempState) != E_OK) return E_UNKNOWN; if (tempState == domainState) diff --git a/AudioManagerDaemon/src/DatabaseHandler.cpp b/AudioManagerDaemon/src/DatabaseHandler.cpp index 5f7ee1d..2337142 100644 --- a/AudioManagerDaemon/src/DatabaseHandler.cpp +++ b/AudioManagerDaemon/src/DatabaseHandler.cpp @@ -113,7 +113,7 @@ am_Error_e DatabaseHandler::enterDomainDB(const am_Domain_s & domainData, am_dom assert(domainData.domainID==0); assert(!domainData.name.empty()); assert(!domainData.busname.empty()); - assert(domainData.state>=DS_MIN && domainData.state<=DS_MAX); + assert(domainData.state>=DS_UNKNOWN && domainData.state<=DS_MAX); //first check for a reserved domain sqlite3_stmt* query = NULL, *queryFinal; @@ -177,7 +177,7 @@ am_Error_e DatabaseHandler::enterDomainDB(const am_Domain_s & domainData, am_dom am_Error_e DatabaseHandler::enterMainConnectionDB(const am_MainConnection_s & mainConnectionData, am_mainConnectionID_t & connectionID) { assert(mainConnectionData.mainConnectionID==0); - assert(mainConnectionData.connectionState>=CS_MIN && mainConnectionData.connectionState<=CS_MAX); + assert(mainConnectionData.connectionState>=CS_UNKNOWN && mainConnectionData.connectionState<=CS_MAX); assert(mainConnectionData.sinkID!=0); assert(mainConnectionData.sourceID!=0); @@ -280,7 +280,7 @@ am_Error_e DatabaseHandler::enterSinkDB(const am_Sink_s & sinkData, am_sinkID_t assert(sinkData.sinkClassID!=0); // \todo: need to check if class exists? assert(!sinkData.listConnectionFormats.empty()); - assert(sinkData.muteState>=MS_MIN && sinkData.muteState<=MS_MAX); + assert(sinkData.muteState>=MS_UNKNOWN && sinkData.muteState<=MS_MAX); sqlite3_stmt *query = NULL, *queryFinal = NULL; int eCode = 0; @@ -452,7 +452,7 @@ am_Error_e DatabaseHandler::enterSinkDB(const am_Sink_s & sinkData, am_sinkID_t am_Error_e DatabaseHandler::enterCrossfaderDB(const am_Crossfader_s & crossfaderData, am_crossfaderID_t & crossfaderID) { assert(crossfaderData.crossfaderID<DYNAMIC_ID_BOUNDARY); - assert(crossfaderData.hotSink>=HS_MIN && crossfaderData.hotSink<=HS_MAX); + assert(crossfaderData.hotSink>=HS_UNKNOWN && crossfaderData.hotSink<=HS_MAX); assert(!crossfaderData.name.empty()); assert(existSink(crossfaderData.sinkID_A)); assert(existSink(crossfaderData.sinkID_B)); @@ -656,7 +656,7 @@ am_Error_e DatabaseHandler::enterSourceDB(const am_Source_s & sourceData, am_sou assert(sourceData.sourceClassID!=0); // \todo: need to check if class exists? assert(!sourceData.listConnectionFormats.empty()); - assert(sourceData.sourceState>=SS_MIN && sourceData.sourceState<=SS_MAX); + assert(sourceData.sourceState>=SS_UNKNNOWN && sourceData.sourceState<=SS_MAX); sqlite3_stmt* query = NULL, *queryFinal = NULL; ; @@ -902,7 +902,7 @@ am_Error_e DatabaseHandler::changeMainConnectionRouteDB(const am_mainConnectionI am_Error_e DatabaseHandler::changeMainConnectionStateDB(const am_mainConnectionID_t mainconnectionID, const am_ConnectionState_e connectionState) { assert(mainconnectionID!=0); - assert(connectionState>=CS_MIN && connectionState<=CS_MAX); + assert(connectionState>=CS_UNKNOWN && connectionState<=CS_MAX); sqlite3_stmt* query = NULL; int eCode = 0; @@ -969,8 +969,8 @@ am_Error_e DatabaseHandler::changeSinkMainVolumeDB(const am_mainVolume_t mainVol am_Error_e DatabaseHandler::changeSinkAvailabilityDB(const am_Availability_s & availability, const am_sinkID_t sinkID) { assert(sinkID!=0); - assert(availability.availability>=A_MIN && availability.availability<=A_MAX); - assert(availability.availabilityReason>=AR_MIN && availability.availabilityReason<=AR_MAX); + assert(availability.availability>=A_UNKNOWN && availability.availability<=A_MAX); + assert(availability.availabilityReason>=AR_UNKNOWN && availability.availabilityReason<=AR_MAX); sqlite3_stmt* query = NULL; int eCode = 0; @@ -1006,7 +1006,7 @@ am_Error_e DatabaseHandler::changeSinkAvailabilityDB(const am_Availability_s & a am_Error_e DatabaseHandler::changDomainStateDB(const am_DomainState_e domainState, const am_domainID_t domainID) { assert(domainID!=0); - assert(domainState>=DS_MIN && domainState<=DS_MAX); + assert(domainState>=DS_UNKNOWN && domainState<=DS_MAX); sqlite3_stmt* query = NULL; int eCode = 0; @@ -1039,7 +1039,7 @@ am_Error_e DatabaseHandler::changDomainStateDB(const am_DomainState_e domainStat am_Error_e DatabaseHandler::changeSinkMuteStateDB(const am_MuteState_e muteState, const am_sinkID_t sinkID) { assert(sinkID!=0); - assert(muteState>=MS_MIN && muteState<=MS_MAX); + assert(muteState>=MS_UNKNOWN && muteState<=MS_MAX); sqlite3_stmt* query = NULL; int eCode = 0; @@ -1074,7 +1074,7 @@ am_Error_e DatabaseHandler::changeSinkMuteStateDB(const am_MuteState_e muteState am_Error_e DatabaseHandler::changeMainSinkSoundPropertyDB(const am_MainSoundProperty_s & soundProperty, const am_sinkID_t sinkID) { - assert(soundProperty.type>=MSP_MIN && soundProperty.type<=MSP_MAX); + assert(soundProperty.type>=MSP_UNKNOWN && soundProperty.type<=MSP_MAX); assert(sinkID!=0); sqlite3_stmt* query = NULL; @@ -1108,7 +1108,7 @@ am_Error_e DatabaseHandler::changeMainSinkSoundPropertyDB(const am_MainSoundProp am_Error_e DatabaseHandler::changeMainSourceSoundPropertyDB(const am_MainSoundProperty_s & soundProperty, const am_sourceID_t sourceID) { - assert(soundProperty.type>=MSP_MIN && soundProperty.type<=MSP_MAX); + assert(soundProperty.type>=MSP_UNKNOWN && soundProperty.type<=MSP_MAX); assert(sourceID!=0); sqlite3_stmt* query = NULL; @@ -1144,8 +1144,8 @@ am_Error_e DatabaseHandler::changeMainSourceSoundPropertyDB(const am_MainSoundPr am_Error_e DatabaseHandler::changeSourceAvailabilityDB(const am_Availability_s & availability, const am_sourceID_t sourceID) { assert(sourceID!=0); - assert(availability.availability>=A_MIN && availability.availability<=A_MAX); - assert(availability.availabilityReason>=AR_MIN && availability.availabilityReason<=AR_MAX); + assert(availability.availability>=A_UNKNOWN && availability.availability<=A_MAX); + assert(availability.availabilityReason>=AR_UNKNOWN && availability.availabilityReason<=AR_MAX); sqlite3_stmt* query = NULL; int eCode = 0; @@ -1180,7 +1180,7 @@ am_Error_e DatabaseHandler::changeSourceAvailabilityDB(const am_Availability_s & am_Error_e DatabaseHandler::changeSystemPropertyDB(const am_SystemProperty_s & property) { - assert(property.type>=SYP_MIN && property.type<=SYP_MAX); + assert(property.type>=SYP_UNKNOWN && property.type<=SYP_MAX); sqlite3_stmt* query = NULL; int eCode = 0; std::string command = "UPDATE " + std::string(SYSTEM_TABLE) + " set value=? WHERE type=?"; @@ -3795,7 +3795,7 @@ am_Error_e DatabaseHandler::getSoureState(const am_sourceID_t sourceID, am_Sourc { assert(sourceID!=0); sqlite3_stmt* query = NULL; - sourceState = SS_MIN; + sourceState = SS_UNKNNOWN; std::string command = "SELECT sourceState FROM " + std::string(SOURCE_TABLE) + " WHERE sourceID=" + i2s(sourceID); int eCode = 0; sqlite3_prepare_v2(mDatabase, command.c_str(), -1, &query, NULL); @@ -3814,7 +3814,7 @@ am_Error_e DatabaseHandler::getSoureState(const am_sourceID_t sourceID, am_Sourc am_Error_e DatabaseHandler::changeSourceState(const am_sourceID_t sourceID, const am_SourceState_e sourceState) { assert(sourceID!=0); - assert(sourceState>=SS_MIN && sourceState<=SS_MAX); + assert(sourceState>=SS_UNKNNOWN && sourceState<=SS_MAX); sqlite3_stmt* query = NULL; std::string command = "UPDATE " + std::string(SOURCE_TABLE) + " SET sourceState=? WHERE sourceID=" + i2s(sourceID); int eCode = 0; @@ -3946,7 +3946,7 @@ am_Error_e DatabaseHandler::getDomainState(const am_domainID_t domainID, am_Doma { assert(domainID!=0); sqlite3_stmt* query = NULL; - state = DS_MIN; + state = DS_UNKNOWN; std::string command = "SELECT domainState FROM " + std::string(DOMAIN_TABLE) + " WHERE domainID=" + i2s(domainID); int eCode = 0; sqlite3_prepare_v2(mDatabase, command.c_str(), -1, &query, NULL); @@ -4164,7 +4164,7 @@ am_Error_e DatabaseHandler::changeSourceVolume(const am_sourceID_t sourceID, con am_Error_e DatabaseHandler::changeSourceSoundPropertyDB(const am_SoundProperty_s & soundProperty, const am_sourceID_t sourceID) { - assert(soundProperty.type>=SP_MIN && soundProperty.type<=SP_MAX); + assert(soundProperty.type>=SP_UNKNOWN && soundProperty.type<=SP_MAX); assert(sourceID!=0); sqlite3_stmt* query = NULL; @@ -4199,7 +4199,7 @@ am_Error_e DatabaseHandler::changeSourceSoundPropertyDB(const am_SoundProperty_s am_Error_e DatabaseHandler::changeSinkSoundPropertyDB(const am_SoundProperty_s & soundProperty, const am_sinkID_t sinkID) { - assert(soundProperty.type>=SP_MIN && soundProperty.type<=SP_MAX); + assert(soundProperty.type>=SP_UNKNOWN && soundProperty.type<=SP_MAX); assert(sinkID!=0); sqlite3_stmt* query = NULL; @@ -4233,7 +4233,7 @@ am_Error_e DatabaseHandler::changeSinkSoundPropertyDB(const am_SoundProperty_s & am_Error_e DatabaseHandler::changeCrossFaderHotSink(const am_crossfaderID_t crossfaderID, const am_HotSink_e hotsink) { assert(crossfaderID!=0); - assert(hotsink>=HS_MIN && hotsink>=HS_MAX); + assert(hotsink>=HS_UNKNOWN && hotsink>=HS_MAX); sqlite3_stmt* query = NULL; int eCode = 0; diff --git a/AudioManagerDaemon/test/CommonFunctions.cpp b/AudioManagerDaemon/test/CommonFunctions.cpp index 10245d7..101548c 100644 --- a/AudioManagerDaemon/test/CommonFunctions.cpp +++ b/AudioManagerDaemon/test/CommonFunctions.cpp @@ -199,8 +199,8 @@ bool CommonFunctions::compareRoute(am_Route_s a, am_Route_s b) std::vector<am_ConnectionFormat_e> CommonFunctions::getStandardConnectionFormatList() { std::vector<am_ConnectionFormat_e> list; - list.push_back(CF_ANALOG); - list.push_back(CF_STEREO); + list.push_back(CF_GENIVI_ANALOG); + list.push_back(CF_GENIVI_STEREO); return list; } @@ -208,10 +208,10 @@ std::vector<am_SoundProperty_s> CommonFunctions::getStandardSoundPropertyList() { std::vector<am_SoundProperty_s> soundPropertyList; am_SoundProperty_s soundProperty; - soundProperty.type = SP_BASS; + soundProperty.type = SP_EXAMPLE_BASS; soundProperty.value = 23; soundPropertyList.push_back(soundProperty); - soundProperty.type = SP_MID; + soundProperty.type = SP_EXAMPLE_MID; soundProperty.value = 2; soundPropertyList.push_back(soundProperty); return soundPropertyList; @@ -221,10 +221,10 @@ std::vector<am_MainSoundProperty_s> CommonFunctions::getStandardMainSoundPropert { std::vector<am_MainSoundProperty_s> mainSoundPropertyList; am_MainSoundProperty_s mainSoundProperty; - mainSoundProperty.type = MSP_NAVIGATION_OFFSET; + mainSoundProperty.type = MSP_UNKNOWN; mainSoundProperty.value = 23; mainSoundPropertyList.push_back(mainSoundProperty); - mainSoundProperty.type = MSP_TEST; + mainSoundProperty.type = MSP_UNKNOWN; mainSoundProperty.value = 3; mainSoundPropertyList.push_back(mainSoundProperty); return mainSoundPropertyList; @@ -235,7 +235,7 @@ void CommonFunctions::createSink(am_Sink_s& sink) const sink.name = "AnySink"; sink.domainID = 4; sink.available.availability = A_AVAILABLE; - sink.available.availabilityReason = AR_NEWMEDIA; + sink.available.availabilityReason = AR_GENIVI_NEWMEDIA; sink.sinkClassID = 1; sink.listConnectionFormats = getStandardConnectionFormatList(); sink.listSoundProperties = getStandardSoundPropertyList(); @@ -252,7 +252,7 @@ void CommonFunctions::createSource(am_Source_s& source) const source.name = "AnySource"; source.domainID = 4; source.available.availability = A_AVAILABLE; - source.available.availabilityReason = AR_NEWMEDIA; + source.available.availabilityReason = AR_GENIVI_NEWMEDIA; source.sourceClassID = 1; source.listConnectionFormats = getStandardConnectionFormatList(); source.listSoundProperties = getStandardSoundPropertyList(); @@ -297,7 +297,7 @@ void CommonFunctions::createConnection(am_Connection_s & connection) const connection.sinkID = 1; connection.sourceID = 2; connection.delay = -1; - connection.connectionFormat = CF_ANALOG; + connection.connectionFormat = CF_GENIVI_ANALOG; } std::vector<bool> CommonFunctions::getStandardConvertionMatrix() diff --git a/AudioManagerDaemon/test/controlInterface/controlInterfaceTest.cpp b/AudioManagerDaemon/test/controlInterface/controlInterfaceTest.cpp index 599d15f..c479004 100644 --- a/AudioManagerDaemon/test/controlInterface/controlInterfaceTest.cpp +++ b/AudioManagerDaemon/test/controlInterface/controlInterfaceTest.cpp @@ -176,8 +176,8 @@ TEST_F(controlInterfaceTest,ackConnect) ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID)); //when asyncConnect is called, we expect a call on the routingInterface - EXPECT_CALL(pMockRoutingInterface,asyncConnect(_,1,2,2,CF_STEREO)).WillOnce(Return(E_OK)); - ASSERT_EQ(E_OK, pControlReceiver.connect(handle,connectionID,CF_STEREO,2,2)); + EXPECT_CALL(pMockRoutingInterface,asyncConnect(_,1,2,2,CF_GENIVI_STEREO)).WillOnce(Return(E_OK)); + ASSERT_EQ(E_OK, pControlReceiver.connect(handle,connectionID,CF_GENIVI_STEREO,2,2)); //The handle should have the correct type ASSERT_EQ(handle.handleType, H_CONNECT); @@ -206,7 +206,7 @@ TEST_F(controlInterfaceTest,ackConnect) ASSERT_TRUE(!connectionList.empty()); //no we try the same, but do expect a no_change answer directly and no call because connection already exists - ASSERT_EQ(E_ALREADY_EXISTS, pControlReceiver.connect(handle,connectionID,CF_STEREO,2,2)); + ASSERT_EQ(E_ALREADY_EXISTS, pControlReceiver.connect(handle,connectionID,CF_GENIVI_STEREO,2,2)); } TEST_F(controlInterfaceTest,ackDisconnect) @@ -231,8 +231,8 @@ TEST_F(controlInterfaceTest,ackDisconnect) ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID)); //now we first need to connect, we expect a call on the routing interface - EXPECT_CALL(pMockRoutingInterface,asyncConnect(_,1,2,2,CF_STEREO)).WillOnce(Return(E_OK)); - ASSERT_EQ(E_OK, pControlReceiver.connect(handle,connectionID,CF_STEREO,2,2)); + EXPECT_CALL(pMockRoutingInterface,asyncConnect(_,1,2,2,CF_GENIVI_STEREO)).WillOnce(Return(E_OK)); + ASSERT_EQ(E_OK, pControlReceiver.connect(handle,connectionID,CF_GENIVI_STEREO,2,2)); //answer with an ack to insert the connection in the database EXPECT_CALL(pMockControlInterface,cbAckConnect(_,E_OK)).Times(1); @@ -334,8 +334,8 @@ TEST_F(controlInterfaceTest,SetSinkVolumeChange) ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID)); //set the volume and expect a call on the routing interface - EXPECT_CALL(pMockRoutingInterface,asyncSetSinkVolume(_,2,11,RAMP_DIRECT,23)).WillOnce(Return(E_OK)); - ASSERT_EQ(E_OK, pControlReceiver.setSinkVolume(handle,sinkID,11,RAMP_DIRECT,23)); + EXPECT_CALL(pMockRoutingInterface,asyncSetSinkVolume(_,2,11,RAMP_GENIVI_DIRECT,23)).WillOnce(Return(E_OK)); + ASSERT_EQ(E_OK, pControlReceiver.setSinkVolume(handle,sinkID,11,RAMP_GENIVI_DIRECT,23)); //check the list of handles. The handle must be in there and have the right type ASSERT_EQ(E_OK, pControlReceiver.getListHandles(handlesList)); @@ -359,7 +359,7 @@ TEST_F(controlInterfaceTest,SetSinkVolumeChange) ASSERT_TRUE(handlesList.empty()); //Now we try again, but the value is unchanged - ASSERT_EQ(E_NO_CHANGE, pControlReceiver.setSinkVolume(handle,sinkID,11,RAMP_DIRECT,23)); + ASSERT_EQ(E_NO_CHANGE, pControlReceiver.setSinkVolume(handle,sinkID,11,RAMP_GENIVI_DIRECT,23)); } TEST_F(controlInterfaceTest,ackSetSourceVolumeChange) @@ -384,8 +384,8 @@ TEST_F(controlInterfaceTest,ackSetSourceVolumeChange) ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID)); //change the sinkVolume, expect a call on the routingInterface - EXPECT_CALL(pMockRoutingInterface,asyncSetSourceVolume(_,2,11,RAMP_DIRECT,23)).WillOnce(Return(E_OK)); - ASSERT_EQ(E_OK, pControlReceiver.setSourceVolume(handle,source.sourceID,11,RAMP_DIRECT,23)); + EXPECT_CALL(pMockRoutingInterface,asyncSetSourceVolume(_,2,11,RAMP_GENIVI_DIRECT,23)).WillOnce(Return(E_OK)); + ASSERT_EQ(E_OK, pControlReceiver.setSourceVolume(handle,source.sourceID,11,RAMP_GENIVI_DIRECT,23)); //check the list of handles. The handle must be in there and have the right type ASSERT_EQ(E_OK, pControlReceiver.getListHandles(handlesList)); @@ -409,7 +409,7 @@ TEST_F(controlInterfaceTest,ackSetSourceVolumeChange) ASSERT_TRUE(handlesList.empty()); //Now we try again, but the value is unchanged - ASSERT_EQ(E_NO_CHANGE, pControlReceiver.setSourceVolume(handle,source.sourceID,11,RAMP_DIRECT,23)); + ASSERT_EQ(E_NO_CHANGE, pControlReceiver.setSourceVolume(handle,source.sourceID,11,RAMP_GENIVI_DIRECT,23)); } TEST_F(controlInterfaceTest,ackSetSinkSoundProperty) @@ -428,7 +428,7 @@ TEST_F(controlInterfaceTest,ackSetSinkSoundProperty) domain.busname = "mock"; sink.sinkID = 2; sink.domainID = 1; - soundProperty.type = SP_BASS; + soundProperty.type = SP_EXAMPLE_BASS; soundProperty.value = 244; //setup environment, we need a domain and a sink @@ -445,7 +445,7 @@ TEST_F(controlInterfaceTest,ackSetSinkSoundProperty) ASSERT_EQ(handlesList[0].handleType, H_SETSINKSOUNDPROPERTY); //read out this property. There is no change, because the ack did not arrive yet. - ASSERT_EQ(E_OK, pDatabaseHandler.getSinkSoundPropertyValue(2,SP_BASS,oldvalue)); + ASSERT_EQ(E_OK, pDatabaseHandler.getSinkSoundPropertyValue(2,SP_EXAMPLE_BASS,oldvalue)); ASSERT_EQ(sink.listSoundProperties[0].value, oldvalue); //lets send the answer and expect a call on the controlInterface @@ -453,7 +453,7 @@ TEST_F(controlInterfaceTest,ackSetSinkSoundProperty) pRoutingReceiver.ackSetSinkSoundProperty(handle, E_OK); //finally, the new value must be in the database - ASSERT_EQ(E_OK, pDatabaseHandler.getSinkSoundPropertyValue(sinkID,SP_BASS,oldvalue)); + ASSERT_EQ(E_OK, pDatabaseHandler.getSinkSoundPropertyValue(sinkID,SP_EXAMPLE_BASS,oldvalue)); ASSERT_EQ(soundProperty.value, oldvalue); //and the handle must be destroyed @@ -480,7 +480,7 @@ TEST_F(controlInterfaceTest,ackSetSourceSoundProperty) domain.busname = "mock"; source.sourceID = 2; source.domainID = 1; - soundProperty.type = SP_BASS; + soundProperty.type = SP_EXAMPLE_BASS; soundProperty.value = 244; //prepare the scene @@ -497,7 +497,7 @@ TEST_F(controlInterfaceTest,ackSetSourceSoundProperty) ASSERT_EQ(handlesList[0].handleType, H_SETSOURCESOUNDPROPERTY); //read out this property. There is no change, because the ack did not arrive yet. - ASSERT_EQ(E_OK, pDatabaseHandler.getSourceSoundPropertyValue(2,SP_BASS,oldvalue)); + ASSERT_EQ(E_OK, pDatabaseHandler.getSourceSoundPropertyValue(2,SP_EXAMPLE_BASS,oldvalue)); ASSERT_EQ(source.listSoundProperties[0].value, oldvalue); //lets send the answer and expect a call on the controlInterface @@ -505,7 +505,7 @@ TEST_F(controlInterfaceTest,ackSetSourceSoundProperty) pRoutingReceiver.ackSetSourceSoundProperty(handle, E_OK); //finally, the new value must be in the database - ASSERT_EQ(E_OK, pDatabaseHandler.getSourceSoundPropertyValue(sourceID,SP_BASS,oldvalue)); + ASSERT_EQ(E_OK, pDatabaseHandler.getSourceSoundPropertyValue(sourceID,SP_EXAMPLE_BASS,oldvalue)); ASSERT_EQ(soundProperty.value, oldvalue); //and the handle must be destroyed diff --git a/AudioManagerDaemon/test/database/databaseTest.cpp b/AudioManagerDaemon/test/database/databaseTest.cpp index caaac76..b31fd48 100644 --- a/AudioManagerDaemon/test/database/databaseTest.cpp +++ b/AudioManagerDaemon/test/database/databaseTest.cpp @@ -96,7 +96,7 @@ void databasetest::createMainConnectionSetup() connection.sinkID = i; connection.sourceID = i; connection.delay = -1; - connection.connectionFormat = CF_ANALOG; + connection.connectionFormat = CF_GENIVI_ANALOG; connection.connectionID = 0; ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,forgetSink)); @@ -176,7 +176,7 @@ TEST_F(databasetest,getMainConnectionInfo) connection.sinkID = i; connection.sourceID = i; connection.delay = -1; - connection.connectionFormat = CF_ANALOG; + connection.connectionFormat = CF_GENIVI_ANALOG; connection.connectionID = 0; ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,forgetSink)); @@ -356,7 +356,7 @@ TEST_F(databasetest, peekSourceID) am_sourceClass_t sourceClassID, peekID; am_SourceClass_s sourceClass; am_ClassProperty_s classProperty; - classProperty.classProperty = CP_SOURCE_TYPE; + classProperty.classProperty = CP_GENIVI_SOURCE_TYPE; classProperty.value = 13; sourceClass.name = sourceName; sourceClass.sourceClassID = 0; @@ -380,7 +380,7 @@ TEST_F(databasetest, peekSinkID) am_sinkClass_t sinkClassID, peekID; am_SinkClass_s sinkClass; am_ClassProperty_s classProperty; - classProperty.classProperty = CP_SOURCE_TYPE; + classProperty.classProperty = CP_GENIVI_SOURCE_TYPE; classProperty.value = 13; sinkClass.name = sinkName; sinkClass.sinkClassID = 0; @@ -423,7 +423,7 @@ TEST_F(databasetest,crossfaders) crossfader.sinkID_B = sinkBID; crossfader.sourceID = sourceID; crossfader.name = "Crossfader"; - crossfader.hotSink = HS_MIN; + crossfader.hotSink = HS_UNKNOWN; std::vector<am_Crossfader_s> listCrossfaders; @@ -470,7 +470,7 @@ TEST_F(databasetest,crossfadersGetFromDomain) crossfader.sinkID_B = sinkBID; crossfader.sourceID = sourceID; crossfader.name = "Crossfader"; - crossfader.hotSink = HS_MIN; + crossfader.hotSink = HS_UNKNOWN; std::vector<am_crossfaderID_t> listCrossfaders; @@ -712,10 +712,10 @@ TEST_F(databasetest,getSinkClassOfSink) am_sinkClass_t sinkClassID; am_Sink_s sink; am_sinkID_t sinkID; - classProperty.classProperty = CP_SINK_TYPE; + classProperty.classProperty = CP_GENIVI_SINK_TYPE; classProperty.value = 1; classPropertyList.push_back(classProperty); - classProperty.classProperty = CP_SOURCE_TYPE; + classProperty.classProperty = CP_GENIVI_SOURCE_TYPE; classProperty.value = 4; classPropertyList.push_back(classProperty); sinkClass.name = "test"; @@ -750,10 +750,10 @@ TEST_F(databasetest,getSourceClassOfSource) am_sourceClass_t sourceClassID; am_Source_s source; am_sourceID_t sourceID; - classProperty.classProperty = CP_SINK_TYPE; + classProperty.classProperty = CP_GENIVI_SINK_TYPE; classProperty.value = 1; classPropertyList.push_back(classProperty); - classProperty.classProperty = CP_SOURCE_TYPE; + classProperty.classProperty = CP_GENIVI_SOURCE_TYPE; classProperty.value = 4; classPropertyList.push_back(classProperty); sourceClass.name = "test"; @@ -782,10 +782,10 @@ TEST_F(databasetest,removeSourceClass) am_SourceClass_s sourceClass; am_ClassProperty_s classProperty; am_sourceClass_t sourceClassID; - classProperty.classProperty = CP_SINK_TYPE; + classProperty.classProperty = CP_GENIVI_SINK_TYPE; classProperty.value = 1; classPropertyList.push_back(classProperty); - classProperty.classProperty = CP_SOURCE_TYPE; + classProperty.classProperty = CP_GENIVI_SOURCE_TYPE; classProperty.value = 4; classPropertyList.push_back(classProperty); sourceClass.name = "test"; @@ -810,10 +810,10 @@ TEST_F(databasetest,updateSourceClass) am_SourceClass_s sourceClass, changedClass; am_ClassProperty_s classProperty; am_sourceClass_t sourceClassID; - classProperty.classProperty = CP_SINK_TYPE; + classProperty.classProperty = CP_GENIVI_SINK_TYPE; classProperty.value = 1; classPropertyList.push_back(classProperty); - classProperty.classProperty = CP_SOURCE_TYPE; + classProperty.classProperty = CP_GENIVI_SOURCE_TYPE; classProperty.value = 4; classPropertyList.push_back(classProperty); sourceClass.name = "test"; @@ -843,10 +843,10 @@ TEST_F(databasetest,enterSourceClass) am_SourceClass_s sourceClass; am_ClassProperty_s classProperty; am_sourceClass_t sourceClassID; - classProperty.classProperty = CP_SINK_TYPE; + classProperty.classProperty = CP_GENIVI_SINK_TYPE; classProperty.value = 1; classPropertyList.push_back(classProperty); - classProperty.classProperty = CP_SOURCE_TYPE; + classProperty.classProperty = CP_GENIVI_SOURCE_TYPE; classProperty.value = 4; classPropertyList.push_back(classProperty); sourceClass.name = "test"; @@ -868,10 +868,10 @@ TEST_F(databasetest,enterSourceClassStatic) am_SourceClass_s sourceClass; am_ClassProperty_s classProperty; am_sourceClass_t sourceClassID; - classProperty.classProperty = CP_SINK_TYPE; + classProperty.classProperty = CP_GENIVI_SINK_TYPE; classProperty.value = 1; classPropertyList.push_back(classProperty); - classProperty.classProperty = CP_SOURCE_TYPE; + classProperty.classProperty = CP_GENIVI_SOURCE_TYPE; classProperty.value = 4; classPropertyList.push_back(classProperty); sourceClass.name = "test"; @@ -893,10 +893,10 @@ TEST_F(databasetest,removeSinkClass) am_SinkClass_s sinkClass; am_ClassProperty_s classProperty; am_sinkClass_t sinkClassID; - classProperty.classProperty = CP_SINK_TYPE; + classProperty.classProperty = CP_GENIVI_SINK_TYPE; classProperty.value = 1; classPropertyList.push_back(classProperty); - classProperty.classProperty = CP_SOURCE_TYPE; + classProperty.classProperty = CP_GENIVI_SOURCE_TYPE; classProperty.value = 4; classPropertyList.push_back(classProperty); sinkClass.name = "test"; @@ -921,10 +921,10 @@ TEST_F(databasetest,updateSinkClass) am_SinkClass_s sinkClass, changedClass; am_ClassProperty_s classProperty; am_sinkClass_t sinkClassID; - classProperty.classProperty = CP_SINK_TYPE; + classProperty.classProperty = CP_GENIVI_SINK_TYPE; classProperty.value = 1; classPropertyList.push_back(classProperty); - classProperty.classProperty = CP_SOURCE_TYPE; + classProperty.classProperty = CP_GENIVI_SOURCE_TYPE; classProperty.value = 4; classPropertyList.push_back(classProperty); sinkClass.name = "test"; @@ -954,10 +954,10 @@ TEST_F(databasetest,enterSinkClass) am_SinkClass_s sinkClass; am_ClassProperty_s classProperty; am_sinkClass_t sinkClassID; - classProperty.classProperty = CP_SINK_TYPE; + classProperty.classProperty = CP_GENIVI_SINK_TYPE; classProperty.value = 1; classPropertyList.push_back(classProperty); - classProperty.classProperty = CP_SOURCE_TYPE; + classProperty.classProperty = CP_GENIVI_SOURCE_TYPE; classProperty.value = 4; classPropertyList.push_back(classProperty); sinkClass.name = "test"; @@ -979,10 +979,10 @@ TEST_F(databasetest,enterSinkClassStatic) am_SinkClass_s sinkClass; am_ClassProperty_s classProperty; am_sinkClass_t sinkClassID; - classProperty.classProperty = CP_SINK_TYPE; + classProperty.classProperty = CP_GENIVI_SINK_TYPE; classProperty.value = 1; classPropertyList.push_back(classProperty); - classProperty.classProperty = CP_SOURCE_TYPE; + classProperty.classProperty = CP_GENIVI_SOURCE_TYPE; classProperty.value = 4; classPropertyList.push_back(classProperty); sinkClass.name = "test"; @@ -1002,7 +1002,7 @@ TEST_F(databasetest, changeSystemProperty) std::vector<am_SystemProperty_s> listSystemProperties, listReturn; am_SystemProperty_s systemProperty; - systemProperty.type = SYP_TEST; + systemProperty.type = SYP_UNKNOWN; systemProperty.value = 33; listSystemProperties.push_back(systemProperty); EXPECT_CALL(pMockInterface,cbSystemPropertyChanged(_)).Times(1); //todo: check the exact value here @@ -1019,7 +1019,7 @@ TEST_F(databasetest, systemProperties) std::vector<am_SystemProperty_s> listSystemProperties, listReturn; am_SystemProperty_s systemProperty; - systemProperty.type = SYP_TEST; + systemProperty.type = SYP_UNKNOWN; systemProperty.value = 33; listSystemProperties.push_back(systemProperty); @@ -1096,7 +1096,7 @@ TEST_F(databasetest, changeSourceMainSoundProperty) am_sourceID_t sourceID; pCF.createSource(source); am_MainSoundProperty_s property; - property.type = MSP_NAVIGATION_OFFSET; + property.type = MSP_UNKNOWN; property.value = 33; EXPECT_CALL(pMockInterface,cbNumberOfSourcesChanged()).Times(1); ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID)); @@ -1137,7 +1137,7 @@ TEST_F(databasetest, changeSinkMainSoundProperty) am_sinkID_t sinkID; pCF.createSink(sink); am_MainSoundProperty_s property; - property.type = MSP_NAVIGATION_OFFSET; + property.type = MSP_UNKNOWN; property.value = 33; EXPECT_CALL(pMockInterface,cbNumberOfSinksChanged()).Times(1); @@ -1220,7 +1220,7 @@ TEST_F(databasetest, changeSinkAvailability) pCF.createSink(sink); am_Availability_s availability; availability.availability = A_UNKNOWN; - availability.availabilityReason = AR_TEMPERATURE; + availability.availabilityReason = AR_GENIVI_TEMPERATURE; EXPECT_CALL(pMockInterface,cbNumberOfSinksChanged()).Times(1); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID)); @@ -1238,7 +1238,7 @@ TEST_F(databasetest, changeSourceAvailability) pCF.createSource(source); am_Availability_s availability; availability.availability = A_UNKNOWN; - availability.availabilityReason = AR_TEMPERATURE; + availability.availabilityReason = AR_GENIVI_TEMPERATURE; source.visible = true; EXPECT_CALL(pMockInterface,cbNumberOfSourcesChanged()).Times(1); @@ -1271,7 +1271,7 @@ TEST_F(databasetest,changeMainConnectionRoute) connection.sinkID = i + 20; connection.sourceID = i + 20; connection.delay = -1; - connection.connectionFormat = CF_ANALOG; + connection.connectionFormat = CF_GENIVI_ANALOG; connection.connectionID = 0; pCF.createSink(sink); diff --git a/AudioManagerDaemon/test/routing/routingTest.cpp b/AudioManagerDaemon/test/routing/routingTest.cpp index 9158064..02733a1 100644 --- a/AudioManagerDaemon/test/routing/routingTest.cpp +++ b/AudioManagerDaemon/test/routing/routingTest.cpp @@ -103,7 +103,7 @@ TEST_F(routingTest,simpleRoute2withDomainNoMatchFormats) source.sourceState = SS_ON; source.sourceID = 0; source.sourceClassID = 5; - source.listConnectionFormats.push_back(CF_MONO); + source.listConnectionFormats.push_back(CF_GENIVI_MONO); ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID)); @@ -115,7 +115,7 @@ TEST_F(routingTest,simpleRoute2withDomainNoMatchFormats) sink.sinkID = 0; sink.sinkClassID = 5; sink.muteState = MS_MUTED; - sink.listConnectionFormats.push_back(CF_ANALOG); + sink.listConnectionFormats.push_back(CF_GENIVI_ANALOG); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID)); @@ -166,7 +166,7 @@ TEST_F(routingTest,simpleRoute2withDomain) source.sourceState = SS_ON; source.sourceID = 0; source.sourceClassID = 5; - source.listConnectionFormats.push_back(CF_ANALOG); + source.listConnectionFormats.push_back(CF_GENIVI_ANALOG); ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID)); @@ -178,7 +178,7 @@ TEST_F(routingTest,simpleRoute2withDomain) sink.sinkID = 0; sink.sinkClassID = 5; sink.muteState = MS_MUTED; - sink.listConnectionFormats.push_back(CF_ANALOG); + sink.listConnectionFormats.push_back(CF_GENIVI_ANALOG); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID)); @@ -235,14 +235,14 @@ TEST_F(routingTest,simpleRoute2DomainsOnlyFree) source.sourceState = SS_ON; source.sourceID = 0; source.sourceClassID = 5; - source.listConnectionFormats.push_back(CF_ANALOG); + source.listConnectionFormats.push_back(CF_GENIVI_ANALOG); gwSource.domainID = domainID2; gwSource.name = "gwsource1"; gwSource.sourceState = SS_ON; gwSource.sourceID = 0; gwSource.sourceClassID = 5; - gwSource.listConnectionFormats.push_back(CF_MONO); + gwSource.listConnectionFormats.push_back(CF_GENIVI_MONO); ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(gwSource,gwSourceID)); @@ -255,14 +255,14 @@ TEST_F(routingTest,simpleRoute2DomainsOnlyFree) sink.sinkID = 0; sink.sinkClassID = 5; sink.muteState = MS_MUTED; - sink.listConnectionFormats.push_back(CF_MONO); + sink.listConnectionFormats.push_back(CF_GENIVI_MONO); gwSink.domainID = domainID1; gwSink.name = "gwSink"; gwSink.sinkID = 0; gwSink.sinkClassID = 5; gwSink.muteState = MS_MUTED; - gwSink.listConnectionFormats.push_back(CF_ANALOG); + gwSink.listConnectionFormats.push_back(CF_GENIVI_ANALOG); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(gwSink,gwSinkID)); @@ -343,14 +343,14 @@ TEST_F(routingTest,simpleRoute2DomainsOnlyFreeNotFree) source.sourceState = SS_ON; source.sourceID = 0; source.sourceClassID = 5; - source.listConnectionFormats.push_back(CF_ANALOG); + source.listConnectionFormats.push_back(CF_GENIVI_ANALOG); gwSource.domainID = domainID2; gwSource.name = "gwsource1"; gwSource.sourceState = SS_ON; gwSource.sourceID = 0; gwSource.sourceClassID = 5; - gwSource.listConnectionFormats.push_back(CF_MONO); + gwSource.listConnectionFormats.push_back(CF_GENIVI_MONO); ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(gwSource,gwSourceID)); @@ -363,14 +363,14 @@ TEST_F(routingTest,simpleRoute2DomainsOnlyFreeNotFree) sink.sinkID = 0; sink.sinkClassID = 5; sink.muteState = MS_MUTED; - sink.listConnectionFormats.push_back(CF_MONO); + sink.listConnectionFormats.push_back(CF_GENIVI_MONO); gwSink.domainID = domainID1; gwSink.name = "gwSink"; gwSink.sinkID = 0; gwSink.sinkClassID = 5; gwSink.muteState = MS_MUTED; - gwSink.listConnectionFormats.push_back(CF_ANALOG); + gwSink.listConnectionFormats.push_back(CF_GENIVI_ANALOG); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(gwSink,gwSinkID)); @@ -418,11 +418,11 @@ TEST_F(routingTest,simpleRoute2DomainsOnlyFreeNotFree) am_connectionID_t id1,id2; connection.sourceID=sourceID; connection.sinkID=gwSinkID; - connection.connectionFormat=CF_ANALOG; + connection.connectionFormat=CF_GENIVI_ANALOG; connection.connectionID=0; connection1.sourceID=gwSourceID; connection1.sinkID=sinkID; - connection1.connectionFormat=CF_ANALOG; + connection1.connectionFormat=CF_GENIVI_ANALOG; connection1.connectionID=0; ASSERT_EQ(E_OK,pDatabaseHandler.enterConnectionDB(connection,id1)); @@ -472,25 +472,25 @@ TEST_F(routingTest,simpleRoute3DomainsListConnectionFormats_2) source.sourceState = SS_ON; source.sourceID = 0; source.sourceClassID = 5; - source.listConnectionFormats.push_back(CF_STEREO); - source.listConnectionFormats.push_back(CF_MONO); + source.listConnectionFormats.push_back(CF_GENIVI_STEREO); + source.listConnectionFormats.push_back(CF_GENIVI_MONO); gwSource.domainID = domainID2; gwSource.name = "gwsource1"; gwSource.sourceState = SS_ON; gwSource.sourceID = 0; gwSource.sourceClassID = 5; - gwSource.listConnectionFormats.push_back(CF_MONO); - gwSource.listConnectionFormats.push_back(CF_STEREO); - gwSource.listConnectionFormats.push_back(CF_ANALOG); + gwSource.listConnectionFormats.push_back(CF_GENIVI_MONO); + gwSource.listConnectionFormats.push_back(CF_GENIVI_STEREO); + gwSource.listConnectionFormats.push_back(CF_GENIVI_ANALOG); gwSource1.domainID = domainID3; gwSource1.name = "gwsource2"; gwSource1.sourceState = SS_ON; gwSource1.sourceID = 0; gwSource1.sourceClassID = 5; - gwSource1.listConnectionFormats.push_back(CF_STEREO); - gwSource1.listConnectionFormats.push_back(CF_MONO); + gwSource1.listConnectionFormats.push_back(CF_GENIVI_STEREO); + gwSource1.listConnectionFormats.push_back(CF_GENIVI_MONO); ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(gwSource,gwSourceID)); @@ -504,23 +504,23 @@ TEST_F(routingTest,simpleRoute3DomainsListConnectionFormats_2) sink.sinkID = 0; sink.sinkClassID = 5; sink.muteState = MS_MUTED; - sink.listConnectionFormats.push_back(CF_MONO); + sink.listConnectionFormats.push_back(CF_GENIVI_MONO); gwSink.domainID = domainID1; gwSink.name = "gwSink"; gwSink.sinkID = 0; gwSink.sinkClassID = 5; gwSink.muteState = MS_MUTED; - gwSink.listConnectionFormats.push_back(CF_STEREO); - gwSink.listConnectionFormats.push_back(CF_MONO); + gwSink.listConnectionFormats.push_back(CF_GENIVI_STEREO); + gwSink.listConnectionFormats.push_back(CF_GENIVI_MONO); gwSink1.domainID = domainID2; gwSink1.name = "gwSink1"; gwSink1.sinkID = 0; gwSink1.sinkClassID = 5; gwSink1.muteState = MS_MUTED; - gwSink1.listConnectionFormats.push_back(CF_ANALOG); - gwSink1.listConnectionFormats.push_back(CF_STEREO); + gwSink1.listConnectionFormats.push_back(CF_GENIVI_ANALOG); + gwSink1.listConnectionFormats.push_back(CF_GENIVI_STEREO); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(gwSink,gwSinkID)); @@ -633,24 +633,24 @@ TEST_F(routingTest,simpleRoute3DomainsListConnectionFormats_1) source.sourceState = SS_ON; source.sourceID = 0; source.sourceClassID = 5; - source.listConnectionFormats.push_back(CF_STEREO); - source.listConnectionFormats.push_back(CF_MONO); + source.listConnectionFormats.push_back(CF_GENIVI_STEREO); + source.listConnectionFormats.push_back(CF_GENIVI_MONO); gwSource.domainID = domainID2; gwSource.name = "gwsource1"; gwSource.sourceState = SS_ON; gwSource.sourceID = 0; gwSource.sourceClassID = 5; - gwSource.listConnectionFormats.push_back(CF_STEREO); - gwSource.listConnectionFormats.push_back(CF_MONO); - gwSource.listConnectionFormats.push_back(CF_ANALOG); + gwSource.listConnectionFormats.push_back(CF_GENIVI_STEREO); + gwSource.listConnectionFormats.push_back(CF_GENIVI_MONO); + gwSource.listConnectionFormats.push_back(CF_GENIVI_ANALOG); gwSource1.domainID = domainID3; gwSource1.name = "gwsource2"; gwSource1.sourceState = SS_ON; gwSource1.sourceID = 0; gwSource1.sourceClassID = 5; - gwSource1.listConnectionFormats.push_back(CF_MONO); + gwSource1.listConnectionFormats.push_back(CF_GENIVI_MONO); ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(gwSource,gwSourceID)); @@ -664,22 +664,22 @@ TEST_F(routingTest,simpleRoute3DomainsListConnectionFormats_1) sink.sinkID = 0; sink.sinkClassID = 5; sink.muteState = MS_MUTED; - sink.listConnectionFormats.push_back(CF_MONO); + sink.listConnectionFormats.push_back(CF_GENIVI_MONO); gwSink.domainID = domainID1; gwSink.name = "gwSink"; gwSink.sinkID = 0; gwSink.sinkClassID = 5; gwSink.muteState = MS_MUTED; - gwSink.listConnectionFormats.push_back(CF_STEREO); - gwSink.listConnectionFormats.push_back(CF_MONO); + gwSink.listConnectionFormats.push_back(CF_GENIVI_STEREO); + gwSink.listConnectionFormats.push_back(CF_GENIVI_MONO); gwSink1.domainID = domainID2; gwSink1.name = "gwSink1"; gwSink1.sinkID = 0; gwSink1.sinkClassID = 5; gwSink1.muteState = MS_MUTED; - gwSink1.listConnectionFormats.push_back(CF_ANALOG); + gwSink1.listConnectionFormats.push_back(CF_GENIVI_ANALOG); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(gwSink,gwSinkID)); @@ -790,22 +790,22 @@ TEST_F(routingTest,simpleRoute3DomainsListConnectionFormats) source.sourceState = SS_ON; source.sourceID = 0; source.sourceClassID = 5; - source.listConnectionFormats.push_back(CF_STEREO); - source.listConnectionFormats.push_back(CF_MONO); + source.listConnectionFormats.push_back(CF_GENIVI_STEREO); + source.listConnectionFormats.push_back(CF_GENIVI_MONO); gwSource.domainID = domainID2; gwSource.name = "gwsource1"; gwSource.sourceState = SS_ON; gwSource.sourceID = 0; gwSource.sourceClassID = 5; - gwSource.listConnectionFormats.push_back(CF_ANALOG); + gwSource.listConnectionFormats.push_back(CF_GENIVI_ANALOG); gwSource1.domainID = domainID3; gwSource1.name = "gwsource2"; gwSource1.sourceState = SS_ON; gwSource1.sourceID = 0; gwSource1.sourceClassID = 5; - gwSource1.listConnectionFormats.push_back(CF_MONO); + gwSource1.listConnectionFormats.push_back(CF_GENIVI_MONO); ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(gwSource,gwSourceID)); @@ -819,22 +819,22 @@ TEST_F(routingTest,simpleRoute3DomainsListConnectionFormats) sink.sinkID = 0; sink.sinkClassID = 5; sink.muteState = MS_MUTED; - sink.listConnectionFormats.push_back(CF_MONO); + sink.listConnectionFormats.push_back(CF_GENIVI_MONO); gwSink.domainID = domainID1; gwSink.name = "gwSink"; gwSink.sinkID = 0; gwSink.sinkClassID = 5; gwSink.muteState = MS_MUTED; - gwSink.listConnectionFormats.push_back(CF_STEREO); - gwSink.listConnectionFormats.push_back(CF_MONO); + gwSink.listConnectionFormats.push_back(CF_GENIVI_STEREO); + gwSink.listConnectionFormats.push_back(CF_GENIVI_MONO); gwSink1.domainID = domainID2; gwSink1.name = "gwSink1"; gwSink1.sinkID = 0; gwSink1.sinkClassID = 5; gwSink1.muteState = MS_MUTED; - gwSink1.listConnectionFormats.push_back(CF_ANALOG); + gwSink1.listConnectionFormats.push_back(CF_GENIVI_ANALOG); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(gwSink,gwSinkID)); @@ -946,35 +946,35 @@ TEST_F(routingTest,simpleRoute4Domains2Routes) source.sourceState = SS_ON; source.sourceID = 0; source.sourceClassID = 5; - source.listConnectionFormats.push_back(CF_MONO); + source.listConnectionFormats.push_back(CF_GENIVI_MONO); gwSource.domainID = domainID2; gwSource.name = "gwsource1"; gwSource.sourceState = SS_ON; gwSource.sourceID = 0; gwSource.sourceClassID = 5; - gwSource.listConnectionFormats.push_back(CF_ANALOG); + gwSource.listConnectionFormats.push_back(CF_GENIVI_ANALOG); gwSource1.domainID = domainID3; gwSource1.name = "gwsource2"; gwSource1.sourceState = SS_ON; gwSource1.sourceID = 0; gwSource1.sourceClassID = 5; - gwSource1.listConnectionFormats.push_back(CF_MONO); + gwSource1.listConnectionFormats.push_back(CF_GENIVI_MONO); gwSource2.domainID = domainID4; gwSource2.name = "gwsource3"; gwSource2.sourceState = SS_OFF; gwSource2.sourceID = 0; gwSource2.sourceClassID = 5; - gwSource2.listConnectionFormats.push_back(CF_STEREO); + gwSource2.listConnectionFormats.push_back(CF_GENIVI_STEREO); gwSource3.domainID = domainID3; gwSource3.name = "gwsource4"; gwSource3.sourceState = SS_OFF; gwSource3.sourceID = 0; gwSource3.sourceClassID = 5; - gwSource3.listConnectionFormats.push_back(CF_MONO); + gwSource3.listConnectionFormats.push_back(CF_GENIVI_MONO); ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(gwSource,gwSourceID)); @@ -990,35 +990,35 @@ TEST_F(routingTest,simpleRoute4Domains2Routes) gwSink.sinkID = 0; gwSink.sinkClassID = 5; gwSink.muteState = MS_MUTED; - gwSink.listConnectionFormats.push_back(CF_MONO); + gwSink.listConnectionFormats.push_back(CF_GENIVI_MONO); gwSink1.domainID = domainID2; gwSink1.name = "gwSink1"; gwSink1.sinkID = 0; gwSink1.sinkClassID = 5; gwSink1.muteState = MS_MUTED; - gwSink1.listConnectionFormats.push_back(CF_ANALOG); + gwSink1.listConnectionFormats.push_back(CF_GENIVI_ANALOG); gwSink2.domainID = domainID3; gwSink2.name = "gwSink2"; gwSink2.sinkID = 0; gwSink2.sinkClassID = 5; gwSink2.muteState = MS_MUTED; - gwSink2.listConnectionFormats.push_back(CF_MONO); + gwSink2.listConnectionFormats.push_back(CF_GENIVI_MONO); gwSink3.domainID = domainID2; gwSink3.name = "gwSink3"; gwSink3.sinkID = 0; gwSink3.sinkClassID = 5; gwSink3.muteState = MS_MUTED; - gwSink3.listConnectionFormats.push_back(CF_ANALOG); + gwSink3.listConnectionFormats.push_back(CF_GENIVI_ANALOG); sink.domainID = domainID4; sink.name = "sink1"; sink.sinkID = 0; sink.sinkClassID = 5; sink.muteState = MS_MUTED; - sink.listConnectionFormats.push_back(CF_STEREO); + sink.listConnectionFormats.push_back(CF_GENIVI_STEREO); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(gwSink,gwSinkID)); @@ -1177,21 +1177,21 @@ TEST_F(routingTest,simpleRoute3DomainsNoConnection) source.sourceState = SS_ON; source.sourceID = 0; source.sourceClassID = 5; - source.listConnectionFormats.push_back(CF_MONO); + source.listConnectionFormats.push_back(CF_GENIVI_MONO); gwSource.domainID = domainID2; gwSource.name = "gwsource1"; gwSource.sourceState = SS_ON; gwSource.sourceID = 0; gwSource.sourceClassID = 5; - gwSource.listConnectionFormats.push_back(CF_ANALOG); + gwSource.listConnectionFormats.push_back(CF_GENIVI_ANALOG); gwSource1.domainID = domainID3; gwSource1.name = "gwsource2"; gwSource1.sourceState = SS_ON; gwSource1.sourceID = 0; gwSource1.sourceClassID = 5; - gwSource1.listConnectionFormats.push_back(CF_MONO); + gwSource1.listConnectionFormats.push_back(CF_GENIVI_MONO); ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(gwSource,gwSourceID)); @@ -1205,21 +1205,21 @@ TEST_F(routingTest,simpleRoute3DomainsNoConnection) sink.sinkID = 0; sink.sinkClassID = 5; sink.muteState = MS_MUTED; - sink.listConnectionFormats.push_back(CF_STEREO); + sink.listConnectionFormats.push_back(CF_GENIVI_STEREO); gwSink.domainID = domainID1; gwSink.name = "gwSink"; gwSink.sinkID = 0; gwSink.sinkClassID = 5; gwSink.muteState = MS_MUTED; - gwSink.listConnectionFormats.push_back(CF_MONO); + gwSink.listConnectionFormats.push_back(CF_GENIVI_MONO); gwSink1.domainID = domainID2; gwSink1.name = "gwSink1"; gwSink1.sinkID = 0; gwSink1.sinkClassID = 5; gwSink1.muteState = MS_MUTED; - gwSink1.listConnectionFormats.push_back(CF_ANALOG); + gwSink1.listConnectionFormats.push_back(CF_GENIVI_ANALOG); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(gwSink,gwSinkID)); @@ -1317,14 +1317,14 @@ TEST_F(routingTest,simpleRoute2Domains) source.sourceState = SS_ON; source.sourceID = 0; source.sourceClassID = 5; - source.listConnectionFormats.push_back(CF_ANALOG); + source.listConnectionFormats.push_back(CF_GENIVI_ANALOG); gwSource.domainID = domainID2; gwSource.name = "gwsource1"; gwSource.sourceState = SS_ON; gwSource.sourceID = 0; gwSource.sourceClassID = 5; - gwSource.listConnectionFormats.push_back(CF_MONO); + gwSource.listConnectionFormats.push_back(CF_GENIVI_MONO); ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(gwSource,gwSourceID)); @@ -1337,14 +1337,14 @@ TEST_F(routingTest,simpleRoute2Domains) sink.sinkID = 0; sink.sinkClassID = 5; sink.muteState = MS_MUTED; - sink.listConnectionFormats.push_back(CF_MONO); + sink.listConnectionFormats.push_back(CF_GENIVI_MONO); gwSink.domainID = domainID1; gwSink.name = "gwSink"; gwSink.sinkID = 0; gwSink.sinkClassID = 5; gwSink.muteState = MS_MUTED; - gwSink.listConnectionFormats.push_back(CF_ANALOG); + gwSink.listConnectionFormats.push_back(CF_GENIVI_ANALOG); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(gwSink,gwSinkID)); @@ -1425,14 +1425,14 @@ TEST_F(routingTest,simpleRoute2DomainsNoMatchConnectionFormats) source.sourceState = SS_ON; source.sourceID = 0; source.sourceClassID = 5; - source.listConnectionFormats.push_back(CF_STEREO); + source.listConnectionFormats.push_back(CF_GENIVI_STEREO); gwSource.domainID = domainID2; gwSource.name = "gwsource1"; gwSource.sourceState = SS_ON; gwSource.sourceID = 0; gwSource.sourceClassID = 5; - gwSource.listConnectionFormats.push_back(CF_MONO); + gwSource.listConnectionFormats.push_back(CF_GENIVI_MONO); ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(gwSource,gwSourceID)); @@ -1445,14 +1445,14 @@ TEST_F(routingTest,simpleRoute2DomainsNoMatchConnectionFormats) sink.sinkID = 0; sink.sinkClassID = 5; sink.muteState = MS_MUTED; - sink.listConnectionFormats.push_back(CF_MONO); + sink.listConnectionFormats.push_back(CF_GENIVI_MONO); gwSink.domainID = domainID1; gwSink.name = "gwSink"; gwSink.sinkID = 0; gwSink.sinkClassID = 5; gwSink.muteState = MS_MUTED; - gwSink.listConnectionFormats.push_back(CF_ANALOG); + gwSink.listConnectionFormats.push_back(CF_GENIVI_ANALOG); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(gwSink,gwSinkID)); @@ -1536,21 +1536,21 @@ TEST_F(routingTest,simpleRoute3Domains) source.sourceState = SS_ON; source.sourceID = 0; source.sourceClassID = 5; - source.listConnectionFormats.push_back(CF_MONO); + source.listConnectionFormats.push_back(CF_GENIVI_MONO); gwSource.domainID = domainID2; gwSource.name = "gwsource1"; gwSource.sourceState = SS_ON; gwSource.sourceID = 0; gwSource.sourceClassID = 5; - gwSource.listConnectionFormats.push_back(CF_ANALOG); + gwSource.listConnectionFormats.push_back(CF_GENIVI_ANALOG); gwSource1.domainID = domainID3; gwSource1.name = "gwsource2"; gwSource1.sourceState = SS_ON; gwSource1.sourceID = 0; gwSource1.sourceClassID = 5; - gwSource1.listConnectionFormats.push_back(CF_MONO); + gwSource1.listConnectionFormats.push_back(CF_GENIVI_MONO); ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(gwSource,gwSourceID)); @@ -1564,21 +1564,21 @@ TEST_F(routingTest,simpleRoute3Domains) sink.sinkID = 0; sink.sinkClassID = 5; sink.muteState = MS_MUTED; - sink.listConnectionFormats.push_back(CF_MONO); + sink.listConnectionFormats.push_back(CF_GENIVI_MONO); gwSink.domainID = domainID1; gwSink.name = "gwSink"; gwSink.sinkID = 0; gwSink.sinkClassID = 5; gwSink.muteState = MS_MUTED; - gwSink.listConnectionFormats.push_back(CF_MONO); + gwSink.listConnectionFormats.push_back(CF_GENIVI_MONO); gwSink1.domainID = domainID2; gwSink1.name = "gwSink1"; gwSink1.sinkID = 0; gwSink1.sinkClassID = 5; gwSink1.muteState = MS_MUTED; - gwSink1.listConnectionFormats.push_back(CF_ANALOG); + gwSink1.listConnectionFormats.push_back(CF_GENIVI_ANALOG); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(gwSink,gwSinkID)); @@ -1688,28 +1688,28 @@ TEST_F(routingTest,simpleRoute4Domains) source.sourceState = SS_ON; source.sourceID = 0; source.sourceClassID = 5; - source.listConnectionFormats.push_back(CF_MONO); + source.listConnectionFormats.push_back(CF_GENIVI_MONO); gwSource.domainID = domainID2; gwSource.name = "gwsource1"; gwSource.sourceState = SS_ON; gwSource.sourceID = 0; gwSource.sourceClassID = 5; - gwSource.listConnectionFormats.push_back(CF_ANALOG); + gwSource.listConnectionFormats.push_back(CF_GENIVI_ANALOG); gwSource1.domainID = domainID3; gwSource1.name = "gwsource2"; gwSource1.sourceState = SS_ON; gwSource1.sourceID = 0; gwSource1.sourceClassID = 5; - gwSource1.listConnectionFormats.push_back(CF_MONO); + gwSource1.listConnectionFormats.push_back(CF_GENIVI_MONO); gwSource2.domainID = domainID4; gwSource2.name = "gwsource3"; gwSource2.sourceState = SS_OFF; gwSource2.sourceID = 0; gwSource2.sourceClassID = 5; - gwSource2.listConnectionFormats.push_back(CF_STEREO); + gwSource2.listConnectionFormats.push_back(CF_GENIVI_STEREO); ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(gwSource,gwSourceID)); @@ -1724,28 +1724,28 @@ TEST_F(routingTest,simpleRoute4Domains) gwSink.sinkID = 0; gwSink.sinkClassID = 5; gwSink.muteState = MS_MUTED; - gwSink.listConnectionFormats.push_back(CF_MONO); + gwSink.listConnectionFormats.push_back(CF_GENIVI_MONO); gwSink1.domainID = domainID2; gwSink1.name = "gwSink1"; gwSink1.sinkID = 0; gwSink1.sinkClassID = 5; gwSink1.muteState = MS_MUTED; - gwSink1.listConnectionFormats.push_back(CF_ANALOG); + gwSink1.listConnectionFormats.push_back(CF_GENIVI_ANALOG); gwSink2.domainID = domainID3; gwSink2.name = "gwSink2"; gwSink2.sinkID = 0; gwSink2.sinkClassID = 5; gwSink2.muteState = MS_MUTED; - gwSink2.listConnectionFormats.push_back(CF_MONO); + gwSink2.listConnectionFormats.push_back(CF_GENIVI_MONO); sink.domainID = domainID4; sink.name = "sink1"; sink.sinkID = 0; sink.sinkClassID = 5; sink.muteState = MS_MUTED; - sink.listConnectionFormats.push_back(CF_STEREO); + sink.listConnectionFormats.push_back(CF_GENIVI_STEREO); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(gwSink,gwSinkID)); diff --git a/AudioManagerDaemon/test/routingInterface/routingInterfaceTest.cpp b/AudioManagerDaemon/test/routingInterface/routingInterfaceTest.cpp index 61ca296..33aa7f6 100644 --- a/AudioManagerDaemon/test/routingInterface/routingInterfaceTest.cpp +++ b/AudioManagerDaemon/test/routingInterface/routingInterfaceTest.cpp @@ -84,8 +84,8 @@ TEST_F(routingInterfaceTest,abort) ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID)); //start a connect, expect a call on the routingInterface - EXPECT_CALL(pMockInterface,asyncConnect(_,_,1,sinkID,CF_ANALOG)).WillOnce(Return(E_OK)); - ASSERT_EQ(E_OK, pControlReceiver.connect(handle,connectionID,CF_ANALOG,1,2)); + EXPECT_CALL(pMockInterface,asyncConnect(_,_,1,sinkID,CF_GENIVI_ANALOG)).WillOnce(Return(E_OK)); + ASSERT_EQ(E_OK, pControlReceiver.connect(handle,connectionID,CF_GENIVI_ANALOG,1,2)); //check the correctness of the handle ASSERT_NE(handle.handle, 0); @@ -128,12 +128,12 @@ TEST_F(routingInterfaceTest,alreadyConnected) sink.domainID = 1; ASSERT_EQ(E_OK, pDatabaseHandler.enterDomainDB(domain,domainID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID)); - EXPECT_CALL(pMockInterface,asyncConnect(_,_,1,sinkID,CF_ANALOG)).WillOnce(Return(E_OK)); + EXPECT_CALL(pMockInterface,asyncConnect(_,_,1,sinkID,CF_GENIVI_ANALOG)).WillOnce(Return(E_OK)); am_Handle_s handle; am_connectionID_t connectionID; - ASSERT_EQ(E_OK, pControlReceiver.connect(handle,connectionID,CF_ANALOG,1,2)); + ASSERT_EQ(E_OK, pControlReceiver.connect(handle,connectionID,CF_GENIVI_ANALOG,1,2)); ASSERT_EQ(E_OK, pDatabaseHandler.changeConnectionFinal(connectionID)); - ASSERT_EQ(E_ALREADY_EXISTS, pControlReceiver.connect(handle,connectionID,CF_ANALOG,1,2)); + ASSERT_EQ(E_ALREADY_EXISTS, pControlReceiver.connect(handle,connectionID,CF_GENIVI_ANALOG,1,2)); ASSERT_NE(handle.handle, 0); ASSERT_EQ(handle.handleType, H_CONNECT); } @@ -146,7 +146,7 @@ TEST_F(routingInterfaceTest,setSinkSoundPropertyNoChange) am_domainID_t domainID; am_Handle_s handle; am_SoundProperty_s soundProperty; - soundProperty.type = SP_TREBLE; + soundProperty.type = SP_EXAMPLE_TREBLE; soundProperty.value = 23; std::vector<am_Handle_s> listHandles; pCF.createSink(sink); @@ -244,7 +244,7 @@ TEST_F(routingInterfaceTest,setSourceVolumeNoChange) am_domainID_t domainID; am_Handle_s handle; am_volume_t volume = 34; - am_RampType_e rampType = RAMP_DIRECT; + am_RampType_e rampType = RAMP_GENIVI_DIRECT; am_time_t rampTime = 300; std::vector<am_Handle_s> listHandles; pCF.createSource(source); @@ -270,7 +270,7 @@ TEST_F(routingInterfaceTest,setSourceVolume) am_domainID_t domainID; am_Handle_s handle; am_volume_t volume = 34; - am_RampType_e rampType = RAMP_DIRECT; + am_RampType_e rampType = RAMP_GENIVI_DIRECT; am_time_t rampTime = 300; std::vector<am_Handle_s> listHandles; pCF.createSource(source); @@ -298,7 +298,7 @@ TEST_F(routingInterfaceTest,setSinkVolumeNoChange) am_domainID_t domainID; am_Handle_s handle; am_volume_t volume = 34; - am_RampType_e rampType = RAMP_DIRECT; + am_RampType_e rampType = RAMP_GENIVI_DIRECT; am_time_t rampTime = 300; std::vector<am_Handle_s> listHandles; pCF.createSink(sink); @@ -324,7 +324,7 @@ TEST_F(routingInterfaceTest,setSinkVolume) am_domainID_t domainID; am_Handle_s handle; am_volume_t volume = 34; - am_RampType_e rampType = RAMP_DIRECT; + am_RampType_e rampType = RAMP_GENIVI_DIRECT; am_time_t rampTime = 300; std::vector<am_Handle_s> listHandles; pCF.createSink(sink); @@ -361,8 +361,8 @@ TEST_F(routingInterfaceTest,connect) sink.domainID = 1; ASSERT_EQ(E_OK, pDatabaseHandler.enterDomainDB(domain,domainID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID)); - EXPECT_CALL(pMockInterface,asyncConnect(_,_,1,sinkID,CF_ANALOG)).WillOnce(Return(E_OK)); - ASSERT_EQ(E_OK, pControlReceiver.connect(handle,connectionID,CF_ANALOG,1,2)); + EXPECT_CALL(pMockInterface,asyncConnect(_,_,1,sinkID,CF_GENIVI_ANALOG)).WillOnce(Return(E_OK)); + ASSERT_EQ(E_OK, pControlReceiver.connect(handle,connectionID,CF_GENIVI_ANALOG,1,2)); ASSERT_NE(handle.handle, 0); ASSERT_EQ(handle.handleType, H_CONNECT); ASSERT_EQ(E_OK, pControlReceiver.getListHandles(listHandles)); @@ -387,8 +387,8 @@ TEST_F(routingInterfaceTest,disconnect) sink.domainID = 1; ASSERT_EQ(E_OK, pDatabaseHandler.enterDomainDB(domain,domainID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID)); - EXPECT_CALL(pMockInterface,asyncConnect(_,_,1,sinkID,CF_ANALOG)).WillOnce(Return(E_OK)); - ASSERT_EQ(E_OK, pControlReceiver.connect(handle,connectionID,CF_ANALOG,1,2)); + EXPECT_CALL(pMockInterface,asyncConnect(_,_,1,sinkID,CF_GENIVI_ANALOG)).WillOnce(Return(E_OK)); + ASSERT_EQ(E_OK, pControlReceiver.connect(handle,connectionID,CF_GENIVI_ANALOG,1,2)); ASSERT_EQ(E_OK, pDatabaseHandler.changeConnectionFinal(connectionID)); EXPECT_CALL(pMockInterface,asyncDisconnect(_,connectionID)).WillOnce(Return(E_OK)); ASSERT_EQ(E_OK, pControlReceiver.disconnect(handle,connectionID)); diff --git a/CHANGELOG b/CHANGELOG deleted file mode 100644 index 7bb3cf3..0000000 --- a/CHANGELOG +++ /dev/null @@ -1,563 +0,0 @@ -commit cc5ee70a393c4b00b41ae869ad8e290d5efab978 -Author: christian mueller <christian.ei.mueller@bmw.de> - - Merge branch 'master', remote branch 'buildsau/master' - -commit b03052149ce2505367ab8177ca497d669ca07b1d -Author: Frank Herchet <frank.fh.herchet@bmw.de> - - * deactivate TelnetServerTest - -commit d554cabc6e68eec43dcc741bae615278c6851e06 -Author: Frank Herchet <frank.fh.herchet@bmw.de> - - * add listMainConnections - * add listMainSources - * add listMainSinks - * some optimizations in CAmTelnetMenuHelper - -commit d5bd9a2a3c8911d5fcec6235fa72008860f74cde -Author: Frank Herchet <frank.fh.herchet@bmw.de> - - * fix reset of 'conn' command if number of arguments < 2 - -commit 6d3b9a654d55e3d04c846baf4e24eb77c5bb0671 -Merge: 6d59e95 04d5bdb -Author: Frank Herchet <frank.fh.herchet@bmw.de> - - * merge - -commit 6d59e9585db35d9a3c16f01b4180ea440e4b5a4a -Author: Frank Herchet <frank.fh.herchet@bmw.de> - - * merge of changes from Christian - -commit 000b6cb9766473e76e3f7790c6579d44a09c81c0 -Author: Frank Herchet <frank.fh.herchet@bmw.de> - - * modify contructor of CAmTelnetMenuHelper - -commit dc3eb79e419cb53f1394300873c204a9a2912823 -Author: Frank Herchet <frank.fh.herchet@bmw.de> - - * add gtest for telnetserver - -commit 04d5bdbf179eaa167cf6720e3328c98b13b26799 -Author: christian mueller <christian.ei.mueller@bmw.de> - - * added command to option telnetserver - * make AudioManager build without warning again - -commit 5abcbd805991d1bdfbc735d786b5f5b0e53aaa45 -Author: christian mueller <christian.ei.mueller@bmw.de> - - * fixed bug in remove connections - * added functionality in default ConnectionPlugin - -commit d8dc623c4e00b72ef4868aca222d7159f533e741 -Author: christian mueller <christian.ei.mueller@bmw.de> - - * added new functions to controlreceiver / databasehandler: - getSinkInfoDB - getSourceInfoDB - getMainConnectionInfoDB - * adopted changeMainConnectionRouteDB to new type - * added tests for these types - * recreation of interfaces - -commit d31807abef3e8f02de5ae4452527769f6c35b3db -Author: christian mueller <christian.ei.mueller@bmw.de> - - * change includes in CAmTelnetMenuHelper - -commit 2aa9d80d254f3b599d01e70c4901ec78f799546e -Merge: e124310 108a14b -Author: christian mueller <christian.ei.mueller@bmw.de> - - Merge remote branch 'buildsau/master' - -commit 108a14bfee8d7e1a79e6accf75217a0ff8569d52 -Author: Frank Herchet <frank.fh.herchet@bmw.de> - - * Update README; Short howto about the telnetserver - -commit e124310a45e6e7798a077fa44ef3ee518193b2cf -Author: christian mueller <christian.ei.mueller@bmw.de> - - * modify RoutingSender Async to match with TestHMI - * modify ControlSenderPlugin to have dummy behaviour - -commit 2ddacca29eccd4192add2b17ad6af357b52ea29b -Author: Frank Herchet <frank.fh.herchet@bmw.de> - - * fix some methods in CAmTelnetMenuHelper - -commit a0042153abf05408409d06c5183efe0905b18055 -Author: Frank Herchet <frank.fh.herchet@bmw.de> - - * merge local changes with updated master - -commit 66ce11e941986259e4c403364e3ee7c8b09864f4 -Author: christian mueller <christian.ei.mueller@bmw.de> - - * fix list domains in telnetserver - -commit d4627908f2f405b7b184bd47b2216adf5d4df486 -Merge: 84b9046 40ade5d -Author: christian mueller <christian.ei.mueller@bmw.de> - - Merge branch 'telnetserver' - -commit 84b90467e8e9dcaafaf75738f4bf9840365424b9 -Author: christian mueller <christian.ei.mueller@bmw.de> - - * adoption of RoutinInterfaceAsync to testHMI - * adoption of projekttypes.h to HMI - * comment out wrapper dlt messages because too much pollution - -commit 40ade5d852e6d4c781f33a20d8e4340d59ec07a8 -Author: Frank Herchet <frank.fh.herchet@bmw.de> - - * remove duplicate current command prompt - * remove debug output of TelnetServer.h - * fix compile error in main.cpp - * remove unused methods in TelnetServer.h - -commit 8d3ad577f57e0a45ef9c0e2f1ce99957445f0eb8 -Author: christian mueller <christian.ei.mueller@bmw.de> - - * more changes regarding test controller. Now a very basic connect is supported - -commit e924eb3ec4717647d61e9ec4d5cc74f81ea749b9 -Author: christian mueller <christian.ei.mueller@bmw.de> - - * changed main to register observer (thanks TGO) - * changed command DBUSplugin to register Connection at 2nd DBUSMessageHandler Instance (thanks TGO) - * Expanded dummyController functionality - -commit 9f9f6fc7d283c60166431c5175b6bbaa53a23c9c -Author: christian mueller <christian.ei.mueller@bmw.de> - - * change doc path - -commit d461527cb74c2fa42202a4466a6eeb07c0848a3a -Author: christian mueller <christian.ei.mueller@bmw.de> - - * renaming of databasetest - copy paste fault - -commit 3a11cd051607c19d91a0eb8118fac87e937de929 -Author: Grape R5 <demo@ubuntu.(none)> - - * TelnetServer Implementation. - * TelnetServerTest Implementation - -commit 8a2db276ede7516038eb5d2bf13b89cc3ff185a7 -Author: christian mueller <christian.ei.mueller@bmw.de> - - * add another routing test - * change answer in case routing can not be done on only one domain - -commit f00468f45b72e2693b79af30665f683967deb5a7 -Author: christian mueller <christian.ei.mueller@bmw.de> - - * restructered document generation. Now only the functions of the daemon are generated - * sockethandler: take [0] instead of .front. added todo to make sockethandler faster - * added test for local routing - -commit e6b739cc7e901ca8637bf3f5a72f5956cd764249 -Author: christian mueller <christian.ei.mueller@bmw.de> - - * added function to routing algorithm that takes care of the route in case source and sink are in the same domain... - -commit ba9e8ff6cfc7de6fadce914b356b6e4b398d5ab3 -Author: christian mueller <christian.ei.mueller@bmw.de> - - * worked in feedback from Thomas Goering towards integration tests - * corrected startup sequence and modified the testplugin so that the startup sequences match - -commit 74cf9b985164be8c28a3cd1b11076900792594f8 -Author: christian mueller <christian.ei.mueller@bmw.de> - - * add an out of memory handler - -commit 9f4c15a8e89d798077ca3edf7f786dbc740aa176 -Author: christian mueller <christian.ei.mueller@bmw.de> - - * implemented peeksinkclassIDs and peeksourceclassIDs - * changed interface of both from const to non-const - * corrected include headers to c++ style, eg. <cassert> - * corrected sendChangedData return type to void - * implemented tests for sinkclass and sourceclass peeking - * fixed bug in sockethandler (FD could not be removed) thanks to Frank - -commit 52a769615e476860f3e4c0196fdf7e5159a7a7c1 -Author: christian mueller <christian.ei.mueller@bmw.de> - - * still the weired error but now really ok. - -commit 0538d699f441beb81ab64b7f59cb87329667287a -Merge: 1b65963 bef6b6f -Author: christian mueller <christian.ei.mueller@bmw.de> - - Merge branch 'master' of https://git.genivi.org/srv/git/AudioManager - -commit 1b659632bc7fa0c1daa021a2d52da390cedec9a7 -Author: christian mueller <christian.ei.mueller@bmw.de> - - * weired git error .. anyway should be ok now - -commit ad0c452e9890a35a1b7a6c2e2421e092c5cf2c2d -Author: christian mueller <christian.ei.mueller@bmw.de> - - * wrapping DLT calls in a new Class because of performance, codesize and lazyness reasons - * the whole project now compiles without a warning with -pedantic - -commit bef6b6f38de4f6b201a1b6ce24855c8894031602 -Author: christian mueller <christian.ei.mueller@bmw.de> - - * fixed non reference in routing interface peeksourceclassID and peeksinkclassID - * fixed bug in complexer usage of routing algorithm - * added more router tests - -commit 58d62c4af578c10375bf9baa946e33f340c42a1f -Author: christian mueller <christian.ei.mueller@bmw.de> - - * regenerated EA code based on Conti Feedback. - * changed paths of audiomanagertypes include in generated files - * changed order of parameters in asyncSetSinkSoundProperty / asyncSetSourceSoundProperty / cbTimingInformationChanged to have common style over all interfaces. - * changed default include paths for Controller etc... - * cleanup of warnings - -commit 93c6b1973d59ce225e9cb5d2bcaea7d01c5fda52 -Author: christian mueller <christian.ei.mueller@bmw.de> - - * routing algorithm improvements - * routing algorithms first tests - -commit af0ba5b505b361679c07899187b7043d867742c3 -Author: christian mueller <christian.ei.mueller@bmw.de> - - * finalized Router implementation - * added new generated ControlSendInterface with router support - -commit 4fe50302a695c625d5161b538da771b2c36bd33e -Author: christian mueller <christian.ei.mueller@bmw.de> - - * formatting all the source code with eclipse source code style - * added used xml to the project - -commit 80213f17291e5b58c733de09f06439d71640d2e2 -Author: christian mueller <christian.ei.mueller@bmw.de> - - * fixed wrong memset in main.cpp (thanks to frank) - * fixed compiler warnings in signalhandler - * added Router Class: this class does now the autorouting job. First commit, no tests yet - -commit adf0d48f869007e4527b00e1a346ed37ee82cc1a -Author: christian mueller <christian.ei.mueller@bmw.de> - - * fix for package building with lower cmake versions - * fix DBus interface to be GLIB tolerant 32bit types - -commit 8a99f39f0a5b84230bb6e764950dc674258870e8 -Author: christian mueller <christian.ei.mueller@bmw.de> - - * fix build without git - -commit 3d458653de2ec50f524b38d33645fd773bcb207f -Author: christian mueller <christian.ei.mueller@bmw.de> - - * fixed compilation without git - * fixed compilation without tests - -commit 23c90675c09d4e2947b5a827a5ebcd5516c0270e -Author: christian mueller <christian.ei.mueller@bmw.de> - - * added package creation based on cpack - * updated .gitignore - -commit a4a4c50ff375d94fa90c13d293b145176f214bf4 -Author: christian mueller <christian.ei.mueller@bmw.de> - - * added install and uninstall routines to make - -commit 915ae08fa586cfa67559cc94a72ac5787df909ea -Author: christian mueller <christian.ei.mueller@bmw.de> - - * just update changelog - -commit 5f02509296864bc5b4b438139a246fb3119802ed -Author: christian mueller <christian.ei.mueller@bmw.de> - - * fixed commandline option p is now recognized - * fixed bug: loading of routing plugins with version control now works - -commit 472d0762b68ce0f2a755b4215515a3e031831495 -Author: christian mueller <christian.ei.mueller@bmw.de> - - * recreated the header files out of the model. Added versioning support in the headerfiles generated - * ensured compatibility with 64 bit systems while compiling dbus [ changed FindDBUS.cmake] - * updated the README to better support building - * updated typo in introspectable string of DBusWrapper - * reworked including strategie - * added getInterfafeVersion method on all interfaces - * added Interface Versioning support - * added version as part of .so ending - * it is no possible to set a vector of source and sink sound properties at a time - * added interface to ask for all loaded plugins on RoutingSender - * added first version of telnet server (not yet productive) - set to not active in CMakeLists.txt - * added changelog (created out of git commit log) - * added default values for all enum types to be save even on other if communication is on other domain - -commit 6ebae8c4d3a340c135ed2f5f611a0e1c31994164 -Author: christian mueller <christian.ei.mueller@bmw.de> - - * fixed sockethandler timespec issues - -commit d2033f10762c1b39b7755f067cb614228336aec8 -Author: christian mueller <christian.ei.mueller@bmw.de> - - changed README, added correct header in files - -commit 93d7610b460c6212a3098a3eccb127fd45ada345 -Author: christian mueller <christian.ei.mueller@bmw.de> - - *added versioning support automatically out of git - *added commandline parser - *changed DLT_CONTEXT for AudioManager to AudioManager - *added signalhandler - *TODO: make signalhandler not only call but correctly rundown the daemon - -commit b7e748007bbe0b16fa8a8a089c6cc8fe43bc7aac -Author: christian mueller <christian.ei.mueller@bmw.de> - - * assert on empty busname (routinginterface) - * added busname for DbusroutingSender - * rework of sockethandlertests - * small changes on compilerflags - * new default error messages on dummy controller plugin - * new plugin Asynchronous including tests - -commit 6b583365d1f0f5c7ff613ecfc323c4d1eba1699d -Author: christian mueller <christian.ei.mueller@bmw.de> - - * finally, first socket test work - -commit cd23bf5e1d2e1d134df91f23ebfd761d770a99db -Author: christian mueller <christian.ei.mueller@bmw.de> - - * fixed no compile bug - * fixed sockethandler loop - -commit 4f74d6e303c58326fe75ee75e1c92cf9263f800d -Author: christian mueller <christian.ei.mueller@bmw.de> - - * rework of buildsystem - * now everything depends on a toplevel CMakefile - * cleanup of makefiles and compiler options - -commit 4618280b6d777ac7bf3bb5cf5b0ea3f0d9e4b2b7 -Author: christian mueller <christian.ei.mueller@bmw.de> - - * new run of code generation by EA - * removed audiomanagertypes.cpp it's creadted by EA, but empty - * get rid of dbusincludes, dbus files are now in the includes folder - -commit b9b9e9ace5c6c7c493438ecf9a4b33b47543e8e3 -Author: christian mueller <christian.ei.mueller@bmw.de> - - * first version of SocketHandler working with DBus - * currently Sockethandler test not working - -commit f8a41c140abbd1d193ed19f6c2be598adc01292a -Author: christian mueller <christian.ei.mueller@bmw.de> - - * fixed bug in database handler connected to delay calculation - -commit 18d1c7ee814993ae3fbee5635650e55472dac587 -Author: christian mueller <christian.ei.mueller@bmw.de> - - * first version of the sockethandler with test - -commit 1c992fd131eab06ee4f5a7090377031975092aba -Author: Christian Mueller <christian@lmuc329619u.(none)> - - - changed header comment - entered correct licence - -commit 2cefc51e7bb2b3810f57e7c340c0c8857de1a05a -Author: Christian Mueller <christian@lmuc329619u.(none)> - - - adds dbus test for command plugin - -commit 18b59afe6cda90607ad0b193088000d4f9749a97 -Author: Christian Mueller <christian@lmuc329619u.(none)> - - - added comments in XML description - - fixed bug in Dbus signal sending - - corrected namespace usage - -commit 392d090c63dcb03df8a044abbc6cc84807e341e5 -Author: Christian Mueller <christian@lmuc329619u.(none)> - - changes to make controlSender compile & loadable - -commit 281cb0d875832bb56c82bad3516fc4021f8be4b0 -Author: Christian Mueller <christian@lmuc329619u.(none)> - - added README - -commit cad108114630deebde684267d67a5b648479679e -Author: Christian Mueller <christian@lmuc329619u.(none)> - - first release ! - -commit 68678bed2dc3d4a5849d283bec84a01e2836603f -Author: Christian Mueller <christian@lmuc329619u.(none)> - - update in headers, small things - -commit 92c8b837306ff1dcd889f9c075435aec50e9aea3 -Author: Christian Mueller <christian@lmuc329619u.(none)> - - . - -commit 205595e3d3e6a1d55be3c462ef02c9f828a77feb -Author: Christian Mueller <christian@lmuc329619u.(none)> - - some updates, new tests - -commit d85e69bbf6d8ec6e087c7af579686923c76079cd -Author: Christian Mueller <christian@lmuc329619u.(none)> - - Some changes, renaming... - -commit 5773404eb801e27179b7c3c7803a990145d6e94a -Author: Christian Mueller <christian@lmuc329619u.(none)> - - total rework - -commit 9826492b0066d47cfa9ba68d6efe737cc3c317a3 -Author: Christian Mueller <christian@lmuc329619u.(none)> - - update on dbus - -commit 2d849dd0b5b1558e92cd0f2cd6dbc556950d631d -Author: Christian Mueller <christian@lmuc329619u.(none)> - - Dbus restructured - -commit df88fefdd7df890aaf2a3206483678851cffc5c5 -Author: Christian Mueller <christian@lmuc329619u.(none)> - - - first time synchronisation with EA - - remodelled some interfaces - - new plugin structure for CommandInterfaces - -commit 2feaef3bb5f91af43573155106c73143597bdf3e -Author: Christian Mueller <christian@lmuc329619u.(none)> - - - daily commit - - dbus working smooth now, implemented signal handling - - changed worker thread for dbus to wait for dbus events not to wakeup every 50 ms - -commit a34ffa9cf03c0685ee4751efb16eca8267e533c3 -Author: Christian Mueller <christian@lmuc329619u.(none)> - - - next part of getting rid of QT - - plugin handling for routing plugins work - - dbus communication works but nof finalized - -commit 4bcad418c039cad5690e62ed63e2b4260c12a517 -Author: Christian Mueller <christian@lmuc329619u.(none)> - - make it compile on 10.04 - -commit 4a67d4c668148dd8b0cd9c818ab45c7c6ac9841a -Author: blacky <blacky@kiwi.(none)> - - added layermanager plugin mechanism - -commit 6d7c17a9ab1bccbf0bc656c87818338de28f408d -Author: blacky <blacky@kiwi.(none)> - - - first attempt to remove QT - - this compiles but does not provide the same functionality - - hookplugin compiles - - other plugins do not - -commit 8da33c909cfce7370ef8e53acb2e3a00464edf37 -Author: christian mueller <christian.ei.mueller@bmw.de> - - - track StructuralPlugins via list - - use this list to deinit the plugins upon destructor call of the hookhandler - -commit 8329c1baf99ece0e93feda1331e089bc0aced52e -Author: christian mueller <christian.ei.mueller@bmw.de> - - adding feature in the compile script: - by adding document to the cmaker call , the documentation will be created. By default the documentation will not be created - -commit 958ff9a0907602f359028261de5d822ac995aede -Author: christian mueller <christian.ei.mueller@bmw.de> - - - just typos in AudioManagerCore - - fixed a bug only updating and showing the first connection - - change in gitignore - -commit 9eb2402884c520a4d7eaa8ce041618bfaa6930b3 -Merge: 0108869 5394c6f -Author: blacky <blacky@kiwi.(none)> - - Merge branch 'master' of https://git.genivi.org/srv/git/AudioManager - -commit 0108869db26775b5e30028b0956adb2007020a10 -Author: blacky <blacky@kiwi.(none)> - - merge due to non empty Repo on genivi git server. Resolving conflics in the READMEFILE - -commit 4a32aebe3776323c176e0fe57298c1220ecc6d2c -Author: blacky <blacky@kiwi.(none)> - - small change on CMakelist in player gui - -commit 9d723d9b3918d8c9227b806aa9f016699e234a15 -Merge: d61f9cb e6ad5d8 -Author: Simon Brandner <simon.brandner@partner.bmw.de> - - Merge branch 'master' of 10.250.89.137:audiomangenivi - -commit e6ad5d883663688d0e36e9d506aa9a1f1190c47f -Author: christian mueller <christian.ei.mueller@bmw.de> - - changed daemon directory name - changed absolute path for doxygen to relative path - -commit d61f9cbeeb25c02d73fc99170b1bdf0cc802002f -Author: Simon Brandner <simon.brandner@partner.bmw.de> - - listInterrruptedSources -> listInterruptedSources - -commit fa4da60f971f55bafe157da87ae9d3bce07389b0 -Author: Simon Brandner <simon.brandner@partner.bmw.de> - - corrected speeling of sourceID - -commit 246e009c14ccec699d9fbb92fde61bba5ebb8221 -Author: Simon Brandner <simon.brandner@partner.bmw.de> - - corrected spelling error in README file - -commit 02acf3cebd9ec61193f63415590929ef40c504c1 -Author: blacky <blacky@kiwi.(none)> - - update & cleanup - -commit 4a33862456def70049364761b2035a536b3c5881 -Author: blacky <blacky@kiwi.(none)> - - Initial submission - -commit 5394c6fa5bf40d9bc8619026cbc4c306211a8499 -Author: Jeremiah C. Foster <jeremiah.foster@pelagicore.com> - - Initial import of TEMPLATE.git dir. diff --git a/CMakeLists.txt b/CMakeLists.txt index a2b56f5..f7702eb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,10 +26,13 @@ cmake_minimum_required(VERSION 2.6) execute_process(COMMAND git describe --tags WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_VARIABLE DAEMONVERSION - OUTPUT_STRIP_TRAILING_WHITESPACE) + OUTPUT_STRIP_TRAILING_WHITESPACE) IF (DAEMON_ERROR) SET( DAEMONVERSION "homebrew-${CMAKE_SOURCE_DIR}" ) +ELSE (DAEMON_ERROR) + STRING(REGEX REPLACE "(-)[^-]+$" "" DAEMONVERSION ${DAEMONVERSION}) + STRING(REGEX REPLACE "-" "." DAEMONVERSION ${DAEMONVERSION}) ENDIF(DAEMON_ERROR) message(STATUS "Build Version ${DAEMONVERSION}") diff --git a/PluginCommandInterfaceDbus/test/dbuscommandpluginInterfaceTest.cpp b/PluginCommandInterfaceDbus/test/dbuscommandpluginInterfaceTest.cpp index 8f7c23f..c190135 100644 --- a/PluginCommandInterfaceDbus/test/dbuscommandpluginInterfaceTest.cpp +++ b/PluginCommandInterfaceDbus/test/dbuscommandpluginInterfaceTest.cpp @@ -77,7 +77,7 @@ ACTION(returnListConnections) listItem.mainConnectionID=15; listItem.sinkID=4; listItem.sourceID=3; - listItem.connectionState=CS_MIN; + listItem.connectionState=CS_UNKNOWN; listItem.delay=34; list.push_back(listItem); arg0=list; @@ -87,8 +87,8 @@ ACTION(returnListSinks) { std::vector<am::am_SinkType_s> list; am::am_SinkType_s listItem; - listItem.availability.availability=A_MIN; - listItem.availability.availabilityReason=AR_NOMEDIA; + listItem.availability.availability=A_UNAVAILABLE; + listItem.availability.availabilityReason=AR_GENIVI_NOMEDIA; listItem.muteState=MS_UNMUTED; listItem.name="mySink"; listItem.sinkClassID=34; @@ -103,7 +103,7 @@ ACTION(returnListSources) std::vector<am::am_SourceType_s> list; am::am_SourceType_s listItem; listItem.availability.availability=A_MAX; - listItem.availability.availabilityReason=AR_SAMEMEDIA; + listItem.availability.availabilityReason=AR_GENIVI_SAMEMEDIA; listItem.name="MySource"; listItem.sourceClassID=12; listItem.sourceID=224; @@ -121,7 +121,7 @@ ACTION(returnListMainSinkSoundProperties) listItem.type=MSP_MAX; listItem.value=223; list.push_back(listItem); - listItem.type=MSP_MIN; + listItem.type=MSP_UNKNOWN; listItem.value=2; list.push_back(listItem); arg1=list; @@ -132,7 +132,7 @@ ACTION(returnListSourceClasses) std::vector<am::am_SourceClass_s> list; am::am_SourceClass_s listItem; am::am_ClassProperty_s property; - property.classProperty=CP_SINK_TYPE; + property.classProperty=CP_GENIVI_SINK_TYPE; property.value=12; listItem.name="FirstCLass"; listItem.sourceClassID=23; @@ -150,7 +150,7 @@ ACTION(returnListSinkClasses) std::vector<am::am_SinkClass_s> list; am::am_SinkClass_s listItem; am::am_ClassProperty_s property; - property.classProperty=CP_SOURCE_TYPE; + property.classProperty=CP_GENIVI_SOURCE_TYPE; property.value=122; listItem.name="FirstCLass"; listItem.sinkClassID=2123; @@ -167,7 +167,7 @@ ACTION(returnListSystemProperties) { std::vector<am::am_SystemProperty_s> list; am::am_SystemProperty_s listItem; - listItem.type=SYP_TEST; + listItem.type=SYP_UNKNOWN; listItem.value=-2245; list.push_back(listItem); arg0=list; @@ -284,7 +284,7 @@ TEST_F(dbuscommandpluginInterfaceTest,Connect) std::cout<<"[volumeStep]"<<std::endl; - EXPECT_CALL(pReceiveInterface,setSinkMuteState(1,MS_MIN)).WillOnce(Return(E_OK)); + EXPECT_CALL(pReceiveInterface,setSinkMuteState(1,MS_UNKNOWN)).WillOnce(Return(E_OK)); system((DBUSCOMMAND + std::string("SetSinkMuteState uint16:1 int16:0 > /tmp/result.txt ")).c_str()); //check the results @@ -305,7 +305,7 @@ TEST_F(dbuscommandpluginInterfaceTest,Connect) std::cout<<"[sinkmutest]"<<std::endl; EXPECT_CALL(pReceiveInterface,setMainSinkSoundProperty(AllOf(Field(&am_MainSoundProperty_s::value, 3), \ - Field(&am_MainSoundProperty_s::type,MSP_MIN)),1)).WillOnce(Return(E_ABORTED)); + Field(&am_MainSoundProperty_s::type,MSP_UNKNOWN)),1)).WillOnce(Return(E_ABORTED)); PyRun_SimpleStringFlags("import dbus\n" @@ -332,7 +332,7 @@ TEST_F(dbuscommandpluginInterfaceTest,Connect) std::cout<<"[sinksound ]"<<std::endl; EXPECT_CALL(pReceiveInterface,setMainSourceSoundProperty(AllOf(Field(&am_MainSoundProperty_s::value, 3), \ - Field(&am_MainSoundProperty_s::type,MSP_MIN)),1)).WillOnce(Return(E_ABORTED)); + Field(&am_MainSoundProperty_s::type,MSP_UNKNOWN)),1)).WillOnce(Return(E_ABORTED)); PyRun_SimpleStringFlags("import dbus\n" "f = open('/tmp/result.txt','w')\n" diff --git a/PluginCommandInterfaceDbus/test/dbuscommaninterfacesignalsTest.cpp b/PluginCommandInterfaceDbus/test/dbuscommaninterfacesignalsTest.cpp index 9b5adb9..2b60d7c 100644 --- a/PluginCommandInterfaceDbus/test/dbuscommaninterfacesignalsTest.cpp +++ b/PluginCommandInterfaceDbus/test/dbuscommaninterfacesignalsTest.cpp @@ -70,8 +70,8 @@ void* cbSinkAdded(void*) mysink.name = "MySink"; mysink.sinkID = 23; mysink.availability.availability = A_MAX; - mysink.availability.availabilityReason = AR_MIN; - mysink.muteState = MS_MIN; + mysink.availability.availabilityReason = AR_UNKNOWN; + mysink.muteState = MS_UNKNOWN; mysink.sinkClassID = 3; mysink.volume = 234; list.push_back(mysink); @@ -96,7 +96,7 @@ void* cbSourceAdded(void*) myource.name = "MySink"; myource.sourceID = 42; myource.availability.availability = A_MAX; - myource.availability.availabilityReason = AR_MIN; + myource.availability.availabilityReason = AR_UNKNOWN; myource.sourceClassID = 15; list.push_back(myource); DbusCommandSender sender; @@ -120,7 +120,7 @@ void* cbSourceRemoved(void*) myource.name = "MySink"; myource.sourceID = 42; myource.availability.availability = A_MAX; - myource.availability.availabilityReason = AR_MIN; + myource.availability.availabilityReason = AR_UNKNOWN; myource.sourceClassID = 15; list.push_back(myource); DbusCommandSender sender; @@ -146,8 +146,8 @@ void* cbSinkRemoved(void*) mysink.name = "MySink"; mysink.sinkID = 23; mysink.availability.availability = A_MAX; - mysink.availability.availabilityReason = AR_MIN; - mysink.muteState = MS_MIN; + mysink.availability.availabilityReason = AR_UNKNOWN; + mysink.muteState = MS_UNKNOWN; mysink.sinkClassID = 3; mysink.volume = 234; list.push_back(mysink); @@ -226,7 +226,7 @@ void* MainSinkSoundPropertyChanged(void*) backdoor.setDbusConnection(&sender, co); am_sinkID_t sinkID = 3; am_MainSoundProperty_s soundProperty; - soundProperty.type = MSP_TEST; + soundProperty.type = MSP_UNKNOWN; soundProperty.value = 23; sender.cbMainSinkSoundPropertyChanged(sinkID, soundProperty); return (NULL); @@ -245,7 +245,7 @@ void* MainSourceSoundPropertyChanged(void*) backdoor.setDbusConnection(&sender, co); am_sourceID_t sourceID = 35; am_MainSoundProperty_s soundProperty; - soundProperty.type = MSP_TEST; + soundProperty.type = MSP_UNKNOWN; soundProperty.value = 233; sender.cbMainSourceSoundPropertyChanged(sourceID, soundProperty); return (NULL); @@ -330,7 +330,7 @@ void* SystemPropertyChanged(void*) DBusConnection* co = dbus_bus_get(DBUS_BUS_SESSION, &error); backdoor.setDbusConnection(&sender, co); am_SystemProperty_s property; - property.type = SYP_TEST; + property.type = SYP_UNKNOWN; property.value = 355; sender.cbSystemPropertyChanged(property); return (NULL); diff --git a/PluginControlInterface/src/ControlSender.cpp b/PluginControlInterface/src/ControlSender.cpp index 9df8232..8969b1a 100644 --- a/PluginControlInterface/src/ControlSender.cpp +++ b/PluginControlInterface/src/ControlSender.cpp @@ -172,7 +172,7 @@ am_Error_e ControlSenderPlugin::hookUserVolumeChange(const am_sinkID_t SinkID, c set.sinkID = SinkID; set.mainVolume = newVolume; am_Error_e error; - if ((error = mControlReceiveInterface->setSinkVolume(set.handle, SinkID, newVolume, RAMP_DIRECT, 20)) != E_OK) + if ((error = mControlReceiveInterface->setSinkVolume(set.handle, SinkID, newVolume, RAMP_GENIVI_DIRECT, 20)) != E_OK) { return error; } @@ -189,7 +189,7 @@ am_Error_e ControlSenderPlugin::hookUserVolumeStep(const am_sinkID_t SinkID, con am_Sink_s sink; mControlReceiveInterface->getSinkInfoDB(SinkID, sink); set.mainVolume = sink.volume + increment; - if ((error = mControlReceiveInterface->setSinkVolume(set.handle, SinkID, set.mainVolume, RAMP_DIRECT, 20)) != E_OK) + if ((error = mControlReceiveInterface->setSinkVolume(set.handle, SinkID, set.mainVolume, RAMP_GENIVI_DIRECT, 20)) != E_OK) { return error; } 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)); diff --git a/includes/audiomanagertypes.h b/includes/audiomanagertypes.h index e0a6c21..c29afd6 100644 --- a/includes/audiomanagertypes.h +++ b/includes/audiomanagertypes.h @@ -22,8 +22,8 @@ *
* THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN
*/
-#if !defined(EA_2D7F1C82_8717_47ce_B755_51DDED15BC18__INCLUDED_)
-#define EA_2D7F1C82_8717_47ce_B755_51DDED15BC18__INCLUDED_
+#if !defined(EA_BB47505C_A541_4063_AF54_010D0AC22821__INCLUDED_)
+#define EA_BB47505C_A541_4063_AF54_010D0AC22821__INCLUDED_
#include <stdint.h>
#include "projecttypes.h"
@@ -124,56 +124,56 @@ namespace am { * After the buildup of a connection the first timing information needs to be sent within 5 seconds, the timing information from the routing adaptors need to be sent via 4 seconds. If the latency for a connection is variable and changes over lifetime of the connection, the routing adaptors shall resend the value and the audiomanger will correct the over all latency.\n * @author christian * @version 1.0 - * @created 10-Feb-2012 1:31:00 PM + * @created 21-Feb-2012 10:06:50 AM */ typedef uint16_t am_domainID_t; /** * @author christian * @version 1.0 - * @created 10-Feb-2012 1:31:00 PM + * @created 21-Feb-2012 10:06:50 AM */ typedef uint16_t am_sourceID_t; /** * @author christian * @version 1.0 - * @created 10-Feb-2012 1:31:00 PM + * @created 21-Feb-2012 10:06:50 AM */ typedef uint16_t am_sinkID_t; /** * @author christian * @version 1.0 - * @created 10-Feb-2012 1:31:00 PM + * @created 21-Feb-2012 10:06:50 AM */ typedef uint16_t am_gatewayID_t; /** * @author christian * @version 1.0 - * @created 10-Feb-2012 1:31:00 PM + * @created 21-Feb-2012 10:06:50 AM */ typedef uint16_t am_crossfaderID_t; /** * @author christian * @version 1.0 - * @created 10-Feb-2012 1:31:00 PM + * @created 21-Feb-2012 10:06:50 AM */ typedef uint16_t am_connectionID_t; /** * @author christian * @version 1.0 - * @created 10-Feb-2012 1:31:00 PM + * @created 21-Feb-2012 10:06:50 AM */ typedef uint16_t am_mainConnectionID_t; /** * @author christian * @version 1.0 - * @created 10-Feb-2012 1:31:01 PM + * @created 21-Feb-2012 10:06:50 AM */ typedef uint16_t am_speed_t; @@ -181,7 +181,7 @@ namespace am { * The unit is 0.1 db steps,The smallest value -3000 (=AM_MUTE). The minimum and maximum can be limited by actual project. * @author christian * @version 1.0 - * @created 10-Feb-2012 1:31:01 PM + * @created 21-Feb-2012 10:06:50 AM */ typedef int16_t am_volume_t; @@ -190,21 +190,21 @@ namespace am { * The range of this type is customer specific. * @author christian * @version 1.0 - * @created 10-Feb-2012 1:31:01 PM + * @created 21-Feb-2012 10:06:50 AM */ typedef int16_t am_mainVolume_t; /** * @author christian * @version 1.0 - * @created 10-Feb-2012 1:31:01 PM + * @created 21-Feb-2012 10:06:50 AM */ typedef uint16_t am_sourceClass_t; /** * @author christian * @version 1.0 - * @created 10-Feb-2012 1:31:01 PM + * @created 21-Feb-2012 10:06:50 AM */ typedef uint16_t am_sinkClass_t; @@ -212,7 +212,7 @@ namespace am { * time in ms! * @author christian * @version 1.0 - * @created 10-Feb-2012 1:31:01 PM + * @created 21-Feb-2012 10:06:50 AM */ typedef uint16_t am_time_t; @@ -220,7 +220,7 @@ namespace am { * offset time that is introduced in milli seconds. * @author christian * @version 1.0 - * @created 10-Feb-2012 1:31:01 PM + * @created 21-Feb-2012 10:06:50 AM */ typedef int16_t am_timeSync_t; @@ -228,197 +228,291 @@ namespace am { * with the help of this enum, sinks and sources can report their availability state * @author christian * @version 1.0 - * @created 10-Feb-2012 1:31:01 PM + * @created 21-Feb-2012 10:06:50 AM */ enum am_Availablility_e { - A_AVAILABLE = 0, - A_UNAVAILABLE = 1, - A_UNKNOWN = 2, - A_MAX = 3, - A_MIN = A_AVAILABLE + /** + * default + */ + A_UNKNOWN = 0, + /** + * The source / sink is available + */ + A_AVAILABLE = 1, + /** + * the source / sink is not available + */ + A_UNAVAILABLE = 2, + A_MAX }; /** * represents the connection state * @author christian * @version 1.0 - * @created 10-Feb-2012 1:31:01 PM + * @created 21-Feb-2012 10:06:50 AM */ enum am_ConnectionState_e { + CS_UNKNOWN = 0, /** * This means the connection is just building up */ - CS_CONNECTING = 0, + CS_CONNECTING = 1, /** * the connection is ready to be used */ - CS_CONNECTED = 1, + CS_CONNECTED = 2, /** * the connection is in the course to be knocked down */ - CS_DISCONNECTING = 2, + CS_DISCONNECTING = 3, /** * only relevant for connectionStatechanged. Is send after the connection was removed */ - CS_DISCONNECTED = 3, + CS_DISCONNECTED = 4, /** * this means the connection is still build up but unused at the moment */ - CS_SUSPENDED = 4, - CS_MAX = 5, - CS_MIN = CS_CONNECTING + CS_SUSPENDED = 5, + CS_MAX }; /** * @author christian * @version 1.0 - * @created 10-Feb-2012 1:31:01 PM + * @created 21-Feb-2012 10:06:50 AM */ enum am_DomainState_e { - DS_CONTROLLED = 0, + /** + * default + */ + DS_UNKNOWN = 0, + /** + * the domain is controlled by the daemon + */ + DS_CONTROLLED = 1, + /** + * the domain is independent starting up + */ DS_INDEPENDENT_STARTUP = 1, + /** + * the domain is independent running down + */ DS_INDEPENDENT_RUNDOWN = 2, - DS_MAX = 3, - DS_MIN = DS_CONTROLLED + DS_MAX }; /** * This enum characterizes the data of the EarlyData_t * @author christian * @version 1.0 - * @created 10-Feb-2012 1:31:01 PM + * @created 21-Feb-2012 10:06:50 AM */ enum am_EarlyDataType_e { - ED_SOURCE_VOLUME = 0, - ED_SINK_VOLUME = 1, - ED_SOURCE_PROPERTY = 2, - ED_SINK_PROPERTY = 3, - ED_MAX = 4, - ES_MIN = ED_SOURCE_VOLUME + /** + * default + */ + ES_UNKNOWN = 0, + /** + * the source volume + */ + ED_SOURCE_VOLUME = 1, + /** + * the sink volume + */ + ED_SINK_VOLUME = 2, + /** + * a source property + */ + ED_SOURCE_PROPERTY = 3, + /** + * a sink property + */ + ED_SINK_PROPERTY = 4, + ED_MAX }; /** * the errors of the audiomanager. All possible errors are in here. This enum is used widely as return parameter. * @author christian * @version 1.0 - * @created 10-Feb-2012 1:31:01 PM + * @created 21-Feb-2012 10:06:50 AM */ enum am_Error_e { - E_OK = 0, - E_UNKNOWN = 1, + /** + * default + */ + E_UNKNOWN = 0, + /** + * no error - positive reply + */ + E_OK = 1, + /** + * value out of range + */ E_OUT_OF_RANGE = 2, + /** + * not used + */ E_NOT_USED = 3, + /** + * a database error occurred + */ E_DATABASE_ERROR = 4, + /** + * the desired object already exists + */ E_ALREADY_EXISTS = 5, + /** + * there is no change + */ E_NO_CHANGE = 6, + /** + * the desired action is not possible + */ E_NOT_POSSIBLE = 7, + /** + * the desired object is non existent + */ E_NON_EXISTENT = 8, + /** + * the asynchronous action was aborted + */ E_ABORTED = 9, /** * This error is returned in case a connect is issued with a connectionFormat that cannot be selected for the connection. This could be either due to the capabilities of a source or a sink or gateway compatibilities for example */ E_WRONG_FORMAT = 10, - E_MAX = 11, - E_MIN = E_OK + E_MAX }; /** * @author christian * @version 1.0 - * @created 10-Feb-2012 1:31:01 PM + * @created 21-Feb-2012 10:06:50 AM */ enum am_MuteState_e { - MS_MUTED = 0, - MS_UNMUTED = 1, - MS_MAX = 2, - MS_MIN = MS_MUTED + /** + * default + */ + MS_UNKNOWN = 0, + /** + * the source / sink is muted + */ + MS_MUTED = 1, + /** + * the source / sink is unmuted + */ + MS_UNMUTED = 2, + MS_MAX }; /** * The source state reflects the state of the source * @author christian * @version 1.0 - * @created 10-Feb-2012 1:31:01 PM + * @created 21-Feb-2012 10:06:50 AM */ enum am_SourceState_e { + SS_UNKNNOWN = 0, /** * The source can be activly heared */ - SS_ON = 0, + SS_ON = 1, /** * The source cannot be heared */ - SS_OFF = 1, + SS_OFF = 2, /** * The source is paused. Meaning it cannot be heared but should be prepared to play again soon. */ - SS_PAUSED = 2, - SS_MAX = 3, - SS_MIN = SS_ON + SS_PAUSED = 3, + SS_MAX }; /** * This enumeration is used to define the type of the action that is correlated to a handle. * @author christian * @version 1.0 - * @created 10-Feb-2012 1:31:01 PM + * @created 21-Feb-2012 10:06:50 AM */ enum am_Handle_e { - H_CONNECT = 0, - H_DISCONNECT = 1, - H_SETSOURCESTATE = 2, - H_SETSINKVOLUME = 3, - H_SETSOURCEVOLUME = 4, - H_SETSINKSOUNDPROPERTY = 5, - H_SETSOURCESOUNDPROPERTY = 6, - H_SETSINKSOUNDPROPERTIES = 7, - H_SETSOURCESOUNDPROPERTIES = 8, - H_CROSSFADE = 9, - H_MAX = 10, - H_MIN = H_CONNECT + H_UNKNOWN = 0, + H_CONNECT = 1, + H_DISCONNECT = 2, + H_SETSOURCESTATE = 3, + H_SETSINKVOLUME = 4, + H_SETSOURCEVOLUME = 5, + H_SETSINKSOUNDPROPERTY = 6, + H_SETSOURCESOUNDPROPERTY = 7, + H_SETSINKSOUNDPROPERTIES = 8, + H_SETSOURCESOUNDPROPERTIES = 9, + H_CROSSFADE = 10, + H_MAX }; /** * @author christian * @version 1.0 - * @created 10-Feb-2012 1:31:01 PM + * @created 21-Feb-2012 10:06:50 AM */ enum am_InterruptState_e { - IS_OFF = 0, - IS_INTERRUPTED = 1, - IS_MAX = 2, - IS_MIN = IS_OFF + /** + * default + */ + IS_UNKNOWN = 0, + /** + * the interrupt state is off - no interrupt + */ + IS_OFF = 1, + /** + * the interrupt state is interrupted - the interrupt is active + */ + IS_INTERRUPTED = 2, + IS_MAX }; /** * describes the active sink of a crossfader. * @author christian * @version 1.0 - * @created 10-Feb-2012 1:31:01 PM + * @created 21-Feb-2012 10:06:50 AM */ enum am_HotSink_e { - HS_SINKA = 0, - HS_SINKB = 1, - HS_INTERMEDIATE = 2, - HS_MAX = 3, - HS_MIN = HS_SINKA + /** + * default + */ + HS_UNKNOWN = 0, + /** + * sinkA is active + */ + HS_SINKA = 1, + /** + * sinkB is active + */ + HS_SINKB = 2, + /** + * the crossfader is in the transition state + */ + HS_INTERMEDIATE = 3, + HS_MAX }; /** * this describes the availability of a sink or a source together with the latest change * @author christian * @version 1.0 - * @created 10-Feb-2012 1:31:01 PM + * @created 21-Feb-2012 10:06:50 AM */ struct am_Availability_s { @@ -438,7 +532,7 @@ namespace am { /** * @author christian * @version 1.0 - * @created 10-Feb-2012 1:31:01 PM + * @created 21-Feb-2012 10:06:50 AM */ struct am_ClassProperty_s { @@ -452,7 +546,7 @@ namespace am { /** * @author christian * @version 1.0 - * @created 10-Feb-2012 1:31:01 PM + * @created 21-Feb-2012 10:06:51 AM */ struct am_Crossfader_s { @@ -470,7 +564,7 @@ namespace am { /** * @author christian * @version 1.0 - * @created 10-Feb-2012 1:31:01 PM + * @created 21-Feb-2012 10:06:51 AM */ struct am_Gateway_s { @@ -511,7 +605,7 @@ namespace am { * This represents one "hopp" in a route * @author christian * @version 1.0 - * @created 10-Feb-2012 1:31:01 PM + * @created 21-Feb-2012 10:06:51 AM */ struct am_RoutingElement_s { @@ -527,7 +621,7 @@ namespace am { /** * @author christian * @version 1.0 - * @created 10-Feb-2012 1:31:02 PM + * @created 21-Feb-2012 10:06:51 AM */ struct am_Route_s { @@ -542,7 +636,7 @@ namespace am { /** * @author christian * @version 1.0 - * @created 10-Feb-2012 1:31:02 PM + * @created 21-Feb-2012 10:06:51 AM */ struct am_SoundProperty_s { @@ -556,7 +650,7 @@ namespace am { /** * @author christian * @version 1.0 - * @created 10-Feb-2012 1:31:02 PM + * @created 21-Feb-2012 10:06:51 AM */ struct am_SystemProperty_s { @@ -576,7 +670,7 @@ namespace am { /** * @author christian * @version 1.0 - * @created 10-Feb-2012 1:31:02 PM + * @created 21-Feb-2012 10:06:51 AM */ struct am_SinkClass_s { @@ -591,7 +685,7 @@ namespace am { /** * @author christian * @version 1.0 - * @created 10-Feb-2012 1:31:02 PM + * @created 21-Feb-2012 10:06:51 AM */ struct am_SourceClass_s { @@ -610,7 +704,7 @@ namespace am { * this type holds all information of sources relevant to the HMI * @author christian * @version 1.0 - * @created 10-Feb-2012 1:31:02 PM + * @created 21-Feb-2012 10:06:52 AM */ struct am_SourceType_s { @@ -627,7 +721,7 @@ namespace am { * this type holds all information of sinks relevant to the HMI * @author christian * @version 1.0 - * @created 10-Feb-2012 1:31:02 PM + * @created 21-Feb-2012 10:06:52 AM */ struct am_SinkType_s { @@ -645,7 +739,7 @@ namespace am { /** * @author christian * @version 1.0 - * @created 10-Feb-2012 1:31:03 PM + * @created 21-Feb-2012 10:06:52 AM */ struct am_Handle_s { @@ -659,7 +753,7 @@ namespace am { /** * @author christian * @version 1.0 - * @created 10-Feb-2012 1:31:03 PM + * @created 21-Feb-2012 10:06:52 AM */ struct am_MainSoundProperty_s { @@ -674,7 +768,7 @@ namespace am { * this type holds all information of connections relevant to the HMI * @author christian * @version 1.0 - * @created 10-Feb-2012 1:31:03 PM + * @created 21-Feb-2012 10:06:52 AM */ struct am_MainConnectionType_s { @@ -691,7 +785,7 @@ namespace am { /** * @author christian * @version 1.0 - * @created 10-Feb-2012 1:31:03 PM + * @created 21-Feb-2012 10:06:52 AM */ struct am_MainConnection_s { @@ -715,7 +809,7 @@ namespace am { /** * @author christian * @version 1.0 - * @created 10-Feb-2012 1:31:03 PM + * @created 21-Feb-2012 10:06:52 AM */ struct am_Sink_s { @@ -739,7 +833,7 @@ namespace am { /** * @author christian * @version 1.0 - * @created 10-Feb-2012 1:31:03 PM + * @created 21-Feb-2012 10:06:53 AM */ struct am_Source_s { @@ -772,7 +866,7 @@ namespace am { /** * @author christian * @version 1.0 - * @created 10-Feb-2012 1:31:03 PM + * @created 21-Feb-2012 10:06:53 AM */ struct am_Domain_s { @@ -791,7 +885,7 @@ namespace am { /** * @author christian * @version 1.0 - * @created 10-Feb-2012 1:31:04 PM + * @created 21-Feb-2012 10:06:53 AM */ struct am_Connection_s { @@ -811,7 +905,7 @@ namespace am { * soundProperty_t in case of ED_SOURCE_PROPERTY, ED_SINK_PROPERTY * @author christian * @version 1.0 - * @created 10-Feb-2012 1:31:04 PM + * @created 21-Feb-2012 10:06:53 AM */ union am_EarlyData_u { @@ -828,7 +922,7 @@ namespace am { * sinkID in case of ED_SINK_VOLUME, ED_SINK_PROPERTY * @author christian * @version 1.0 - * @created 10-Feb-2012 1:31:04 PM + * @created 21-Feb-2012 10:06:53 AM */ union am_DataType_u { @@ -842,7 +936,7 @@ namespace am { /** * @author christian * @version 1.0 - * @created 10-Feb-2012 1:31:04 PM + * @created 21-Feb-2012 10:06:53 AM */ struct am_EarlyData_s { @@ -854,4 +948,4 @@ namespace am { }; } -#endif // !defined(EA_2D7F1C82_8717_47ce_B755_51DDED15BC18__INCLUDED_) +#endif // !defined(EA_BB47505C_A541_4063_AF54_010D0AC22821__INCLUDED_) diff --git a/includes/config.h b/includes/config.h deleted file mode 100644 index 6d89da4..0000000 --- a/includes/config.h +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef _CONFIG_H -#define _CONFIG_H - -#define DAEMONVERSION "ver-0.0.9-29-gcc5ee70" - -#define WITH_DBUS_WRAPPER -#define WITH_SOCKETHANDLER_LOOP -/* #undef WITH_SIMPLEDBUS_LOOP */ -#define WITH_PPOLL -#define WITH_TELNET -#define GLIB_DBUS_TYPES_TOLERANT - -#define DEFAULT_PLUGIN_COMMAND_DIR "/home/christian/workspace/AudioManager/bin/plugins/command" -#define DEFAULT_PLUGIN_ROUTING_DIR "/home/christian/workspace/AudioManager/bin/plugins/routing" -#define CONTROLLER_PLUGIN "/home/christian/workspace/AudioManager/bin/plugins/control/libPluginControlInterface.so" - -#define DEFAULT_TELNETPORT 6060 -#define MAX_TELNETCONNECTIONS 3 - -#define DBUS_SERVICE_PREFIX "org.genivi.audiomanager" -#define DBUS_SERVICE_OBJECT_PATH "/org/genivi/audiomanager" - -#define INTROSPECTION_COMMAND_XML_FILE "/home/christian/workspace/AudioManager/includes/dbus/CommandInterface.xml" - -#endif /* _CONFIG_H */ diff --git a/includes/projecttypes.h b/includes/projecttypes.h index 2f84f4c..792b0fe 100644 --- a/includes/projecttypes.h +++ b/includes/projecttypes.h @@ -22,61 +22,101 @@ *
* THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN
*/
-#if !defined(EA_9A582C38_7B95_4ebf_B316_F765C90F29C5__INCLUDED_)
-#define EA_9A582C38_7B95_4ebf_B316_F765C90F29C5__INCLUDED_
+#if !defined(EA_3D55671A_C1DC_4042_9EBF_5738C754BF63__INCLUDED_)
+#define EA_3D55671A_C1DC_4042_9EBF_5738C754BF63__INCLUDED_
namespace am {
/**
* This enum classifies the format in which data is exchanged within a connection. The enum itself is project specific although there are some Genivi standard formats defined.
* @author christian
* @version 1.0
- * @created 26-Jan-2012 6:00:52 PM
+ * @created 21-Feb-2012 10:06:54 AM
*/
enum am_ConnectionFormat_e
{
- CF_STEREO = 0,
- CF_MONO = 1,
- CF_ANALOG = 2,
- CF_MAX = 3,
- CF_MIN = CF_STEREO
+ /**
+ * default
+ */
+ CF_UNKNOWN = 0,
+ /**
+ * plain mono
+ */
+ CF_GENIVI_MONO = 1,
+ /**
+ * stereo connection
+ */
+ CF_GENIVI_STEREO = 2,
+ /**
+ * analog connection
+ */
+ CF_GENIVI_ANALOG = 3,
+ /**
+ * automatic connection.
+ */
+ CF_GENIVI_AUTO = 4,
+ CF_MAX
};
/**
* This enum gives the information about reason for reason for Source/Sink change
* @author christian
* @version 1.0
- * @created 26-Jan-2012 6:00:52 PM
+ * @created 21-Feb-2012 10:06:54 AM
*/
enum am_AvailabilityReason_e
{
- AR_NEWMEDIA = 0,
- AR_SAMEMEDIA = 1,
- AR_NOMEDIA = 2,
- AR_UNKNOWN = 3,
- AR_TEMPERATURE = 4,
- AR_VOLTAGE = 5,
- AR_MAX = 6,
- AR_MIN = AR_NEWMEDIA
+ /**
+ * default
+ */
+ AR_UNKNOWN = 0,
+ /**
+ * the availability changed because an new media was entered
+ */
+ AR_GENIVI_NEWMEDIA = 1,
+ /**
+ * the availability changed because the same media was entered
+ */
+ AR_GENIVI_SAMEMEDIA = 2,
+ /**
+ * the availability changed because there is no media
+ */
+ AR_GENIVI_NOMEDIA = 3,
+ /**
+ * the availability changed because of a temperature event
+ */
+ AR_GENIVI_TEMPERATURE = 4,
+ /**
+ * the availability changed because of a voltage event
+ */
+ AR_GENIVI_VOLTAGE = 5,
+ /**
+ * the availability changed because of fatal errors reading or accessing media
+ */
+ AR_GENIVI_ERRORMEDIA = 6,
+ AR_MAX
};
/**
* product specific identifier of property
* @author christian
* @version 1.0
- * @created 26-Jan-2012 6:00:52 PM
+ * @created 21-Feb-2012 10:06:54 AM
*/
enum am_ClassProperty_e
{
/**
+ * default
+ */
+ CP_UNKNOWN = 0,
+ /**
* defines the source type of a source. Project specific, could be for example differentiation between interrupt source and main source.
*/
- CP_SOURCE_TYPE = 0,
+ CP_GENIVI_SOURCE_TYPE = 1,
/**
* defines the SINK_TYPE. Project specific
*/
- CP_SINK_TYPE = 1,
- CP_MAX = 2,
- CP_MIN = CP_SOURCE_TYPE
+ CP_GENIVI_SINK_TYPE = 2,
+ CP_MAX
};
/**
@@ -84,70 +124,92 @@ namespace am { * It is in the responsibility of the product to make sure that the routing plugins are aware of the ramp types used. * @author christian * @version 1.0 - * @created 26-Jan-2012 6:00:52 PM + * @created 21-Feb-2012 10:06:54 AM */ enum am_RampType_e { + RAMP_UNKNOWN = 0, /** * this ramp type triggers a direct setting of the value without a ramp */ - RAMP_DIRECT = 0, + RAMP_GENIVI_DIRECT = 1, /** * This ramp type will set the volume as fast as possible. */ - RAMP_NO_BLOB = 1, - RAMP_LOG = 2, - RAMP_STRAIGHT = 3, - RAMP_MAX = 4, - RAMP_MIN = RAMP_DIRECT + RAMP_GENIVI_NO_PLOB = 2, + RAMP_GENIVI_EXP_INV = 3, + RAMP_GENIVI_LINEAR = 4, + RAMP_GENIVI_EXP = 5, + RAMP_MAX }; /** * sound properties. Within genivi only the standard properties are defined, for products these need to be extended. * @author christian * @version 1.0 - * @created 26-Jan-2012 6:00:52 PM + * @created 21-Feb-2012 10:06:54 AM */ enum am_SoundPropertyType_e { - SP_TREBLE = 0, - SP_MID = 1, - SP_BASS = 2, - SP_MAX = 3, - SP_MIN = SP_TREBLE + /** + * default + */ + SP_UNKNOWN = 0, + /** + * example treble value min =-10 max =10 + */ + SP_EXAMPLE_TREBLE = 1, + /** + * example mid value min =-10 max =10 + */ + SP_EXAMPLE_MID = 2, + /** + * example bass value min =-10 max =10 + */ + SP_EXAMPLE_BASS = 3, + SP_MAX }; /** * Here are all SoundProperties that can be set via the CommandInterface. Product specific * @author christian * @version 1.0 - * @created 26-Jan-2012 6:00:52 PM + * @created 21-Feb-2012 10:06:54 AM */ enum am_MainSoundPropertyType_e { /** - * gives the navigation offset in percent + * default + */ + MSP_UNKNOWN = 0, + /** + * example value between -10 and +10 + */ + MSP_EXAMPLE_TREBLE = 1, + /** + * example value between -10 and +10 + */ + MSP_EXAMPLE_MID = 2, + /** + * example value between -10 and +10 */ - MSP_NAVIGATION_OFFSET = 0, - MSP_TEST = 1,
- MSP_BASS = 2,
- MSP_TREBLE = 3,
- MSP_MID = 4, - MSP_MAX = 5, - MSP_MIN = MSP_NAVIGATION_OFFSET + MSP_EXAMPLE_BASS = 3, + MSP_MAX }; /** * describes the different system properties. Project specific * @author christian * @version 1.0 - * @created 26-Jan-2012 6:00:52 PM + * @created 21-Feb-2012 10:06:54 AM */ enum am_SystemPropertyType_e { - SYP_TEST = 0, - SYP_MAX = 1, - SYP_MIN = SYP_TEST + /** + * default + */ + SYP_UNKNOWN = 0, + SYP_MAX }; } -#endif // !defined(EA_9A582C38_7B95_4ebf_B316_F765C90F29C5__INCLUDED_) +#endif // !defined(EA_3D55671A_C1DC_4042_9EBF_5738C754BF63__INCLUDED_) |