summaryrefslogtreecommitdiff
path: root/include/audiomanagertypes.h
diff options
context:
space:
mode:
authorJens Lorenz <jlorenz@de.adit-jv.com>2014-07-10 10:35:54 +0200
committerChristian Linke <christian.linke@bmw.de>2014-07-11 17:44:11 +0200
commit038732ec315808ccebda557e88a79bec9febf5a9 (patch)
treeaf21a8cfa6a54615cf750a1899bf3f62ffc1b443 /include/audiomanagertypes.h
parent5e4950430ca01fadcf11cfdba7b1ccbb329d8b76 (diff)
downloadaudiomanager-038732ec315808ccebda557e88a79bec9febf5a9.tar.gz
Bug #100 - update of interface version numbers and added removed comments
Signed-off-by: Jens Lorenz <jlorenz@de.adit-jv.com>
Diffstat (limited to 'include/audiomanagertypes.h')
-rwxr-xr-xinclude/audiomanagertypes.h63
1 files changed, 28 insertions, 35 deletions
diff --git a/include/audiomanagertypes.h b/include/audiomanagertypes.h
index 2066222..b5bedd9 100755
--- a/include/audiomanagertypes.h
+++ b/include/audiomanagertypes.h
@@ -1,32 +1,32 @@
-/**
+/**
* Copyright (C) 2012 - 2014, BMW AG
- *
- * This file is part of GENIVI Project AudioManager.
- *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
- *
- * \copyright
- * This Source Code Form is subject to the terms of the
- * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with
- * this file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- *
+ *
+ * This file is part of GENIVI Project AudioManager.
+ *
+ * Contributions are licensed to the GENIVI Alliance under one or more
+ * Contribution License Agreements.
+ *
+ * \copyright
+ * This Source Code Form is subject to the terms of the
+ * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with
+ * this file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ *
* \author Christian Linke, christian.linke@bmw.de BMW 2011 - 2014
- *
- * \file
+ *
+ * \file
* For further information see http://projects.genivi.org/audio-manager
- *
+ *
* THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL.
* PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN.
- */
-#if !defined(EA_FDF9AAA5_5FA3_4604_A7A4_865A9FD3AF11__INCLUDED_)
-#define EA_FDF9AAA5_5FA3_4604_A7A4_865A9FD3AF11__INCLUDED_
-
-#include <stdint.h>
-#include <string>
-#include <vector>
-
+ */
+#if !defined(EA_4FF89D4E_BF3C_465a_85C9_1DC47E4FA742__INCLUDED_)
+#define EA_4FF89D4E_BF3C_465a_85C9_1DC47E4FA742__INCLUDED_
+
+#include <stdint.h>
+#include <string>
+#include <vector>
+
namespace am {
/**
@@ -132,13 +132,9 @@ static const am_CustomClassProperty_t CP_GENIVI_SINK_TYPE = 2;
*/
typedef uint16_t am_CustomConnectionFormat_t;
static const am_CustomConnectionFormat_t CF_UNKNOWN = 0;
-/** plain mono */
static const am_CustomConnectionFormat_t CF_GENIVI_MONO = 1;
-/** stereo connection */
static const am_CustomConnectionFormat_t CF_GENIVI_STEREO = 2;
-/** analog connection */
static const am_CustomConnectionFormat_t CF_GENIVI_ANALOG = 3;
-/** automatic connection. */
static const am_CustomConnectionFormat_t CF_GENIVI_AUTO = 4;
/**
@@ -147,11 +143,8 @@ static const am_CustomConnectionFormat_t CF_GENIVI_AUTO = 4;
*/
typedef uint16_t am_CustomMainSoundPropertyType_t;
static const am_CustomMainSoundPropertyType_t MSP_UNKNOWN = 0;
-/** example value between -10 and +10 */
static const am_CustomMainSoundPropertyType_t MSP_GENIVI_TREBLE = 1;
-/** example value between -10 and +10 */
static const am_CustomMainSoundPropertyType_t MSP_GENIVI_MID = 2;
-/** example value between -10 and +10 */
static const am_CustomMainSoundPropertyType_t MSP_GENIVI_BASS = 3;
/**
@@ -171,8 +164,11 @@ static const am_CustomRampType_t RAMP_UNKNOWN = 0;
static const am_CustomRampType_t RAMP_GENIVI_DIRECT = 1;
/** Sets the volume as fast as possible */
static const am_CustomRampType_t RAMP_GENIVI_NO_PLOP = 2;
+/** inverted exponential update, high gradient at the start - soft end */
static const am_CustomRampType_t RAMP_GENIVI_EXP_INV = 3;
+/** continues update of volume */
static const am_CustomRampType_t RAMP_GENIVI_LINEAR = 4;
+/** exponential update, soft start - high gradient at the end */
static const am_CustomRampType_t RAMP_GENIVI_EXP = 5;
/**
@@ -181,11 +177,8 @@ static const am_CustomRampType_t RAMP_GENIVI_EXP = 5;
*/
typedef uint16_t am_CustomSoundPropertyType_t;
static const am_CustomSoundPropertyType_t SP_UNKNOWN = 0;
-/** example treble value min =-10 max =10 */
static const am_CustomSoundPropertyType_t SP_GENIVI_TREBLE = 1;
-/** example mid value min =-10 max =10 */
static const am_CustomSoundPropertyType_t SP_GENIVI_MID = 2;
-/** example bass value min =-10 max =10 */
static const am_CustomSoundPropertyType_t SP_GENIVI_BASS = 3;
/**
@@ -1380,4 +1373,4 @@ public:
};
}
-#endif // !defined(EA_FDF9AAA5_5FA3_4604_A7A4_865A9FD3AF11__INCLUDED_)
+#endif // !defined(EA_4FF89D4E_BF3C_465a_85C9_1DC47E4FA742__INCLUDED_)