summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Linke <christian.linke@bmw.de>2014-03-28 17:07:52 +0100
committerChristian Linke <christian.linke@bmw.de>2014-03-28 17:07:52 +0100
commitbb5555a19894300c7c35aa92da79a7701ac02d36 (patch)
tree2fc8681773d046bf3e104850ab0c2ed2085fc4ea
parent7666421ecaa46c0244e6272db80e0192aed47a28 (diff)
downloadaudiomanager-bb5555a19894300c7c35aa92da79a7701ac02d36.tar.gz
* reverted back projecttypes.h to GENIVI only types.
Signed-off-by: Christian Linke <christian.linke@bmw.de>
-rw-r--r--PluginRoutingInterfaceCAPI/test/CAmRoutingInterfaceCAPITests.cpp16
-rw-r--r--include/projecttypes.h93
2 files changed, 30 insertions, 79 deletions
diff --git a/PluginRoutingInterfaceCAPI/test/CAmRoutingInterfaceCAPITests.cpp b/PluginRoutingInterfaceCAPI/test/CAmRoutingInterfaceCAPITests.cpp
index 7238dc2..d941da6 100644
--- a/PluginRoutingInterfaceCAPI/test/CAmRoutingInterfaceCAPITests.cpp
+++ b/PluginRoutingInterfaceCAPI/test/CAmRoutingInterfaceCAPITests.cpp
@@ -69,7 +69,7 @@ void initSink(org::genivi::am::am_Sink_s & newSink, am_Sink_s & newAmSink, const
org::genivi::am::am_MuteState_e muteState = org::genivi::am::am_MuteState_e::MS_UNKNOWN;
org::genivi::am::am_Availability_s available(org::genivi::am::am_Availability_e::A_MAX, static_cast<org::genivi::am::am_AvailabilityReason_pe>(AR_MAX));
org::genivi::am::am_SoundProperty_L listSoundProperties;
- listSoundProperties.push_back(org::genivi::am::am_SoundProperty_s(static_cast<org::genivi::am::am_SoundPropertyType_pe>(SP_INPUTB), 100));
+ listSoundProperties.push_back(org::genivi::am::am_SoundProperty_s(static_cast<org::genivi::am::am_SoundPropertyType_pe>(SP_EXAMPLE_MID), 100));
listSoundProperties.push_back(org::genivi::am::am_SoundProperty_s(static_cast<org::genivi::am::am_SoundPropertyType_pe>(SP_EXAMPLE_BASS), 101));
listSoundProperties.push_back(org::genivi::am::am_SoundProperty_s(static_cast<org::genivi::am::am_SoundPropertyType_pe>(SP_MAX), 102));
org::genivi::am::am_ConnectionFormat_L listConnectionFormats;
@@ -95,7 +95,7 @@ void initSource(org::genivi::am::am_Source_s & newSource, am_Source_s & newAmSou
org::genivi::am::am_SourceState_e srcState = org::genivi::am::am_SourceState_e::SS_MAX;
org::genivi::am::am_Availability_s available(org::genivi::am::am_Availability_e::A_MAX, static_cast<org::genivi::am::am_AvailabilityReason_pe>(AR_MAX));
org::genivi::am::am_SoundProperty_L listSoundProperties;
- listSoundProperties.push_back(org::genivi::am::am_SoundProperty_s(static_cast<org::genivi::am::am_SoundPropertyType_pe>(SP_INPUTB), 100));
+ listSoundProperties.push_back(org::genivi::am::am_SoundProperty_s(static_cast<org::genivi::am::am_SoundPropertyType_pe>(SP_EXAMPLE_MID), 100));
listSoundProperties.push_back(org::genivi::am::am_SoundProperty_s(static_cast<org::genivi::am::am_SoundPropertyType_pe>(SP_EXAMPLE_BASS), 101));
listSoundProperties.push_back(org::genivi::am::am_SoundProperty_s(static_cast<org::genivi::am::am_SoundPropertyType_pe>(SP_MAX), 102));
org::genivi::am::am_ConnectionFormat_L listConnectionFormats;
@@ -1913,9 +1913,9 @@ TEST_F(CAmRoutingSenderCAPITests, TestDomain_asyncSetSinkSoundProperties)
am_SourceState_e state = am_SourceState_e::SS_MAX;
std::vector<am_SoundProperty_s> listSoundProperties;
- listSoundProperties.push_back((am_SoundProperty_s){am_SoundPropertyType_e::SP_INPUTB, 100});
+ listSoundProperties.push_back((am_SoundProperty_s){am_SoundPropertyType_e::SP_EXAMPLE_MID, 100});
listSoundProperties.push_back((am_SoundProperty_s){am_SoundPropertyType_e::SP_MAX, 101});
- listSoundProperties.push_back((am_SoundProperty_s){am_SoundPropertyType_e::SP_PRIORITY, 100});
+ listSoundProperties.push_back((am_SoundProperty_s){am_SoundPropertyType_e::SP_EXAMPLE_TREBLE, 100});
EXPECT_CALL(*env->mpRoutingReceive, ackSetSinkSoundProperties(IsHandleEqual(handle), E_OK)).Times(1);
am_Error_e error = env->mpPlugin->asyncSetSinkSoundProperties(handle, sID, listSoundProperties);
@@ -1942,7 +1942,7 @@ TEST_F(CAmRoutingSenderCAPITests, TestDomain_asyncSetSinkSoundProperty)
am_SourceState_e state = am_SourceState_e::SS_MAX;
EXPECT_CALL(*env->mpRoutingReceive, ackSetSinkSoundProperty(IsHandleEqual(handle), E_OK)).Times(1);
- am_Error_e error = env->mpPlugin->asyncSetSinkSoundProperty(handle, sID, (am_SoundProperty_s){am_SoundPropertyType_e::SP_INPUTB, 100});
+ am_Error_e error = env->mpPlugin->asyncSetSinkSoundProperty(handle, sID, (am_SoundProperty_s){am_SoundPropertyType_e::SP_EXAMPLE_MID, 100});
usleep(50000);
ASSERT_EQ( error, E_OK );
ASSERT_FALSE( backdoor.containsHandle( handle.handle) );
@@ -1966,9 +1966,9 @@ TEST_F(CAmRoutingSenderCAPITests, TestDomain_asyncSetSourceSoundProperties)
am_SourceState_e state = am_SourceState_e::SS_MAX;
std::vector<am_SoundProperty_s> listSoundProperties;
- listSoundProperties.push_back((am_SoundProperty_s){am_SoundPropertyType_e::SP_INPUTB, 100});
+ listSoundProperties.push_back((am_SoundProperty_s){am_SoundPropertyType_e::SP_EXAMPLE_MID, 100});
listSoundProperties.push_back((am_SoundProperty_s){am_SoundPropertyType_e::SP_MAX, 101});
- listSoundProperties.push_back((am_SoundProperty_s){am_SoundPropertyType_e::SP_PRIORITY, 100});
+ listSoundProperties.push_back((am_SoundProperty_s){am_SoundPropertyType_e::SP_EXAMPLE_TREBLE, 100});
EXPECT_CALL(*env->mpRoutingReceive, ackSetSourceSoundProperties(IsHandleEqual(handle), E_OK)).Times(1);
am_Error_e error = env->mpPlugin->asyncSetSourceSoundProperties(handle, sID, listSoundProperties);
@@ -1995,7 +1995,7 @@ TEST_F(CAmRoutingSenderCAPITests, TestDomain_asyncSetSourceSoundProperty)
am_SourceState_e state = am_SourceState_e::SS_MAX;
EXPECT_CALL(*env->mpRoutingReceive, ackSetSourceSoundProperty(IsHandleEqual(handle), E_OK)).Times(1);
- am_Error_e error = env->mpPlugin->asyncSetSourceSoundProperty(handle, sID, (am_SoundProperty_s){am_SoundPropertyType_e::SP_INPUTB, 100});
+ am_Error_e error = env->mpPlugin->asyncSetSourceSoundProperty(handle, sID, (am_SoundProperty_s){am_SoundPropertyType_e::SP_EXAMPLE_MID, 100});
usleep(50000);
ASSERT_EQ( error, E_OK );
ASSERT_FALSE( backdoor.containsHandle( handle.handle) );
diff --git a/include/projecttypes.h b/include/projecttypes.h
index fc889b1..00919a0 100644
--- a/include/projecttypes.h
+++ b/include/projecttypes.h
@@ -12,23 +12,22 @@
* this file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
*
- * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012
+ * \author Christian Mueller, christian.linke@bmw.de BMW 2011,2012
*
* \file
* For further information see http://www.genivi.org/.
*
* THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN
*/
-#if !defined(EA_B5ABC40A_CD0B_4c35_BB93_F4EA426C0B58__INCLUDED_)
-#define EA_B5ABC40A_CD0B_4c35_BB93_F4EA426C0B58__INCLUDED_
+#if !defined(EA_793BA955_1445_4da2_9C22_4EFA92A026C5__INCLUDED_)
+#define EA_793BA955_1445_4da2_9C22_4EFA92A026C5__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.
+ * 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 Mueller
- * @created 28-Jun-2012 14:00:25
+ * @created 16-Dez-2012 15:58:14
*/
enum am_ConnectionFormat_e
{
@@ -52,14 +51,13 @@ namespace am {
* automatic connection.
*/
CF_GENIVI_AUTO = 4,
-
CF_MAX
};
/**
* This enum gives the information about reason for reason for Source/Sink change
* @author Christian Mueller
- * @created 28-Jun-2012 14:00:25
+ * @created 16-Dez-2012 15:58:14
*/
enum am_AvailabilityReason_e
{
@@ -97,7 +95,7 @@ namespace am {
/**
* product specific identifier of property
* @author Christian Mueller
- * @created 28-Jun-2012 14:00:25
+ * @created 16-Dez-2012 15:58:14
*/
enum am_ClassProperty_e
{
@@ -106,47 +104,22 @@ namespace am {
*/
CP_UNKNOWN = 0,
/**
- * defines the source type of a source. Project specific, could be for example
- * differentiation between interrupt source and main source.
+ * defines the source type of a source. Project specific, could be for example differentiation between interrupt source
+ * and main source.
*/
- CP_ENTERTAINMENT = 1,
+ CP_GENIVI_SOURCE_TYPE = 1,
/**
* defines the SINK_TYPE. Project specific
*/
- CP_INTERRUPT_OVERLAY = 2,
-
- CP_INTERRUPT_SUPERSEEDING = 3,
-
- CP_PDC =4,
-
- CP_GONG = 5,
-
- CP_CROSSFADER = 6,
-
- CP_GENIVI_SOURCE_TYPE=7,
-
- CP_GENIVI_SINK_TYPE=8,
-
- CP_VIRTUAL_MAINSINK = 9,
-
- CP_INVISIBLE_SOURCE = 10,
-
- CP_PLAINSINK = 11,
-
- CP_MAINSINK = 12,
-
- CP_INVISIBLE_SINK = 13,
-
+ CP_GENIVI_SINK_TYPE = 2,
CP_MAX
};
/**
- * The given ramp types here are just a possiblity. for products, different ramp
- * types can be defined here.
- * It is in the responsibility of the product to make sure that the routing
- * plugins are aware of the ramp types used.
+ * The given ramp types here are just a possiblity. for products, different ramp types can be defined here.
+ * It is in the responsibility of the product to make sure that the routing plugins are aware of the ramp types used.
* @author Christian Mueller
- * @created 28-Jun-2012 14:00:25
+ * @created 16-Dez-2012 15:58:14
*/
enum am_RampType_e
{
@@ -166,10 +139,9 @@ namespace am {
};
/**
- * sound properties. Within genivi only the standard properties are defined, for
- * products these need to be extended.
+ * sound properties. Within genivi only the standard properties are defined, for products these need to be extended.
* @author Christian Mueller
- * @created 28-Jun-2012 14:00:25
+ * @created 16-Dez-2012 15:58:14
*/
enum am_SoundPropertyType_e
{
@@ -189,23 +161,13 @@ namespace am {
* example bass value min =-10 max =10
*/
SP_EXAMPLE_BASS = 3,
-
- SP_ENTER_SINKID = 4,
-
- SP_INTERR_SUPERSEEDINGID = 5,
-
- SP_INTERR_OVERLAYID = 6,
-
- SP_PRIORITY = 7,
-
SP_MAX
};
/**
- * Here are all SoundProperties that can be set via the CommandInterface. Product
- * specific
+ * Here are all SoundProperties that can be set via the CommandInterface. Product specific
* @author Christian Mueller
- * @created 28-Jun-2012 14:00:25
+ * @created 16-Dez-2012 15:58:14
*/
enum am_MainSoundPropertyType_e
{
@@ -225,16 +187,13 @@ namespace am {
* example value between -10 and +10
*/
MSP_EXAMPLE_BASS = 3,
-
- MSP_SOURCE_TYPE = 4,
-
MSP_MAX
};
/**
* describes the different system properties. Project specific
* @author Christian Mueller
- * @created 28-Jun-2012 14:00:25
+ * @created 16-Dez-2012 15:58:14
*/
enum am_SystemPropertyType_e
{
@@ -245,19 +204,11 @@ namespace am {
SYP_MAX
};
- enum am_sourceType_e
- {
- ST_MULTIMEDIA_LIBRARY = 0,
- ST_TUNER = 1,
- ST_AUX_STREAM = 2,
- ST_MAX
- };
-
/**
* gives the type of the Notification.
* @author q232968
* @version 1.0
- * @created 05-Dez-2012 12:36:55
+ * @created 16-Dez-2012 15:58:14
*/
enum am_NotificationType_e
{
@@ -265,4 +216,4 @@ namespace am {
NT_MAX
};
}
-#endif // !defined(EA_B5ABC40A_CD0B_4c35_BB93_F4EA426C0B58__INCLUDED_)
+#endif // !defined(EA_793BA955_1445_4da2_9C22_4EFA92A026C5__INCLUDED_)