summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
Diffstat (limited to 'includes')
-rw-r--r--includes/audiomanagertypes.h460
-rw-r--r--includes/command/CommandReceiveInterface.h21
-rw-r--r--includes/command/CommandSendInterface.h21
-rw-r--r--includes/config.h25
-rw-r--r--includes/control/ControlReceiveInterface.h29
-rw-r--r--includes/control/ControlSendInterface.h24
-rw-r--r--includes/projecttypes.h183
-rw-r--r--includes/routing/RoutingReceiveInterface.h21
-rw-r--r--includes/routing/RoutingSendInterface.h21
9 files changed, 458 insertions, 347 deletions
diff --git a/includes/audiomanagertypes.h b/includes/audiomanagertypes.h
index e0a6c21..f1bd542 100644
--- a/includes/audiomanagertypes.h
+++ b/includes/audiomanagertypes.h
@@ -10,7 +10,7 @@
*
* \section License
* GNU Lesser General Public License, version 2.1, with special exception (GENIVI clause)
-* Copyright (C) 2011, BMW AG Christian M?ller Christian.ei.mueller@bmw.de
+* Copyright (C) 2011, BMW AG Christian Mueller Christian.ei.mueller@bmw.de
*
* This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation.
* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License, version 2.1, for more details.
@@ -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_6D2D8AED_B7CC_424e_8C3F_EB10C5EBDC21__INCLUDED_)
+#define EA_6D2D8AED_B7CC_424e_8C3F_EB10C5EBDC21__INCLUDED_
#include <stdint.h>
#include "projecttypes.h"
@@ -37,10 +37,9 @@ namespace am {
* This is the domain type. Each domain has a unique identifier.
*
* \mainpage
- * \image html "Bild1.png"
- * Copyright Copyright (C) 2011, BMW AG
+ * Copyright Copyright (C) 2011,2012 BMW AG
*
- * \date 22.06.2011
+ * \date 21.2.2012
*
* \author Christian Mueller (christian.ei.mueller@bmw.de)
*
@@ -95,6 +94,14 @@ namespace am {
*
* This interface is used by the AudioManager to control the RoutingAdapters and communicate with them. The communication is based on two interfaces, one is provided by the AudioManager for communication from the adapters towards the AudioManager and one for the opposite direction. The design of the AudioManager shall be done in such a way that several Interfaces are supported at the same time via a plug-in mechanism. The plug-ins are (either statically - due to performance reasons or dynamically) loaded at start-up. Due to this architecture, the number of buses and routing adapters that are supported are as low as possible for each system and as high as needed without the need of changing the AudioManager itself. The AudioManager expects a bus-like structure behind each plug-in, so that a plug-in can implement a bus interface and proxy the messages to the routing adapters - the AudioManager will be capable of addressing more than one adapter one each plug-in. The interface shall is asynchronous for all timely critical commands.
*
+ * \section interfaces Interfaces
+ * the calls to the interfaces of the AudioManagerDaemon are generally not threadsafe !
+ * Nevertheless if such calls from a different thread-context are needed, you may use the defered-call pattern that utilizes the mainloop (Sockethandler) to get self called in the next loop of the mainloop. For more infomation please check the audiomanger wiki page.
+ *
+ * \section deferred The deferred call pattern
+ * Create a unix pipe or socket and add the file descriptor to the Sockethandler. Whenever a call needs to be deferred you can store the necessary information protected by a mutex in a queue and write to the socket or pipe. This will lead to a callback in the next loop of the mainloop - when getting called by the callback that was registered at the Sockethandler execute your call with the information stored away.
+ *
+ *
* \section sources_sinks Sources & Sinks
* \subsection Visibility
* Sources and sinks can either be visible or not. If they are visible, the HMI is informed about their existence and can use them. \n
@@ -122,303 +129,372 @@ namespace am {
* It is the job of the AudioManager to retrieve all latency timing information from each connection, to aggregate this information and provide a latency information on a per MainConnection Basis. It is not the task of the AudioManager to actually delay or speed up video or audio signals to achieve a lipsync. The actual correction shall be done in the videoplayer with the information provided by the AudioManager.
* The time information is always reported by the routingadaptors for each connection. Delays that are introduced in a sink or a gateway are counting for the connection that connects to this sink or gateway.\n
* 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
+ * @author Christian Mueller
+ * @created 21-Feb-2012 4:58:31 PM
*/
typedef uint16_t am_domainID_t;
/**
- * @author christian
- * @version 1.0
- * @created 10-Feb-2012 1:31:00 PM
+ * @author Christian Mueller
+ * @created 21-Feb-2012 4:58:31 PM
*/
typedef uint16_t am_sourceID_t;
/**
- * @author christian
- * @version 1.0
- * @created 10-Feb-2012 1:31:00 PM
+ * @author Christian Mueller
+ * @created 21-Feb-2012 4:58:31 PM
*/
typedef uint16_t am_sinkID_t;
/**
- * @author christian
- * @version 1.0
- * @created 10-Feb-2012 1:31:00 PM
+ * @author Christian Mueller
+ * @created 21-Feb-2012 4:58:31 PM
*/
typedef uint16_t am_gatewayID_t;
/**
- * @author christian
- * @version 1.0
- * @created 10-Feb-2012 1:31:00 PM
+ * @author Christian Mueller
+ * @created 21-Feb-2012 4:58:31 PM
*/
typedef uint16_t am_crossfaderID_t;
/**
- * @author christian
- * @version 1.0
- * @created 10-Feb-2012 1:31:00 PM
+ * @author Christian Mueller
+ * @created 21-Feb-2012 4:58:31 PM
*/
typedef uint16_t am_connectionID_t;
/**
- * @author christian
- * @version 1.0
- * @created 10-Feb-2012 1:31:00 PM
+ * @author Christian Mueller
+ * @created 21-Feb-2012 4:58:31 PM
*/
typedef uint16_t am_mainConnectionID_t;
/**
- * @author christian
- * @version 1.0
- * @created 10-Feb-2012 1:31:01 PM
+ * @author Christian Mueller
+ * @created 21-Feb-2012 4:58:31 PM
*/
typedef uint16_t am_speed_t;
/**
* 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
+ * @author Christian Mueller
+ * @created 21-Feb-2012 4:58:31 PM
*/
typedef int16_t am_volume_t;
/**
* This is the volume presented on the command interface. It is in the duty of the Controller to change the volumes given here into meaningful values on the routing interface.
* The range of this type is customer specific.
- * @author christian
- * @version 1.0
- * @created 10-Feb-2012 1:31:01 PM
+ * @author Christian Mueller
+ * @created 21-Feb-2012 4:58:31 PM
*/
typedef int16_t am_mainVolume_t;
/**
- * @author christian
- * @version 1.0
- * @created 10-Feb-2012 1:31:01 PM
+ * @author Christian Mueller
+ * @created 21-Feb-2012 4:58:31 PM
*/
typedef uint16_t am_sourceClass_t;
/**
- * @author christian
- * @version 1.0
- * @created 10-Feb-2012 1:31:01 PM
+ * @author Christian Mueller
+ * @created 21-Feb-2012 4:58:31 PM
*/
typedef uint16_t am_sinkClass_t;
/**
* time in ms!
- * @author christian
- * @version 1.0
- * @created 10-Feb-2012 1:31:01 PM
+ * @author Christian Mueller
+ * @created 21-Feb-2012 4:58:31 PM
*/
typedef uint16_t am_time_t;
/**
* offset time that is introduced in milli seconds.
- * @author christian
- * @version 1.0
- * @created 10-Feb-2012 1:31:01 PM
+ * @author Christian Mueller
+ * @created 21-Feb-2012 4:58:31 PM
*/
typedef int16_t am_timeSync_t;
/**
* 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
+ * @author Christian Mueller
+ * @created 21-Feb-2012 4:58:31 PM
*/
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
+ * @author Christian Mueller
+ * @created 21-Feb-2012 4:58:31 PM
*/
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
+ * @author Christian Mueller
+ * @created 21-Feb-2012 4:58:31 PM
*/
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
+ * @author Christian Mueller
+ * @created 21-Feb-2012 4:58:31 PM
*/
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
+ * @author Christian Mueller
+ * @created 21-Feb-2012 4:58:31 PM
*/
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
+ * @author Christian Mueller
+ * @created 21-Feb-2012 4:58:31 PM
*/
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
+ * @author Christian Mueller
+ * @created 21-Feb-2012 4:58:31 PM
*/
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
+ * @author Christian Mueller
+ * @created 21-Feb-2012 4:58:31 PM
*/
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
+ * @author Christian Mueller
+ * @created 21-Feb-2012 4:58:31 PM
*/
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
+ * @author Christian Mueller
+ * @created 21-Feb-2012 4:58:32 PM
*/
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
+ * @author Christian Mueller
+ * @created 21-Feb-2012 4:58:32 PM
*/
struct am_Availability_s
{
@@ -436,9 +512,8 @@ namespace am {
};
/**
- * @author christian
- * @version 1.0
- * @created 10-Feb-2012 1:31:01 PM
+ * @author Christian Mueller
+ * @created 21-Feb-2012 4:58:32 PM
*/
struct am_ClassProperty_s
{
@@ -450,9 +525,8 @@ namespace am {
};
/**
- * @author christian
- * @version 1.0
- * @created 10-Feb-2012 1:31:01 PM
+ * @author Christian Mueller
+ * @created 21-Feb-2012 4:58:32 PM
*/
struct am_Crossfader_s
{
@@ -468,9 +542,8 @@ namespace am {
};
/**
- * @author christian
- * @version 1.0
- * @created 10-Feb-2012 1:31:01 PM
+ * @author Christian Mueller
+ * @created 21-Feb-2012 4:58:32 PM
*/
struct am_Gateway_s
{
@@ -509,9 +582,8 @@ namespace am {
/**
* This represents one "hopp" in a route
- * @author christian
- * @version 1.0
- * @created 10-Feb-2012 1:31:01 PM
+ * @author Christian Mueller
+ * @created 21-Feb-2012 4:58:32 PM
*/
struct am_RoutingElement_s
{
@@ -525,9 +597,8 @@ namespace am {
};
/**
- * @author christian
- * @version 1.0
- * @created 10-Feb-2012 1:31:02 PM
+ * @author Christian Mueller
+ * @created 21-Feb-2012 4:58:32 PM
*/
struct am_Route_s
{
@@ -540,9 +611,8 @@ namespace am {
};
/**
- * @author christian
- * @version 1.0
- * @created 10-Feb-2012 1:31:02 PM
+ * @author Christian Mueller
+ * @created 21-Feb-2012 4:58:32 PM
*/
struct am_SoundProperty_s
{
@@ -554,9 +624,8 @@ namespace am {
};
/**
- * @author christian
- * @version 1.0
- * @created 10-Feb-2012 1:31:02 PM
+ * @author Christian Mueller
+ * @created 21-Feb-2012 4:58:33 PM
*/
struct am_SystemProperty_s
{
@@ -574,9 +643,8 @@ namespace am {
};
/**
- * @author christian
- * @version 1.0
- * @created 10-Feb-2012 1:31:02 PM
+ * @author Christian Mueller
+ * @created 21-Feb-2012 4:58:33 PM
*/
struct am_SinkClass_s
{
@@ -589,9 +657,8 @@ namespace am {
};
/**
- * @author christian
- * @version 1.0
- * @created 10-Feb-2012 1:31:02 PM
+ * @author Christian Mueller
+ * @created 21-Feb-2012 4:58:33 PM
*/
struct am_SourceClass_s
{
@@ -608,9 +675,8 @@ 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
+ * @author Christian Mueller
+ * @created 21-Feb-2012 4:58:33 PM
*/
struct am_SourceType_s
{
@@ -625,9 +691,8 @@ 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
+ * @author Christian Mueller
+ * @created 21-Feb-2012 4:58:33 PM
*/
struct am_SinkType_s
{
@@ -643,9 +708,8 @@ namespace am {
};
/**
- * @author christian
- * @version 1.0
- * @created 10-Feb-2012 1:31:03 PM
+ * @author Christian Mueller
+ * @created 21-Feb-2012 4:58:33 PM
*/
struct am_Handle_s
{
@@ -657,9 +721,8 @@ namespace am {
};
/**
- * @author christian
- * @version 1.0
- * @created 10-Feb-2012 1:31:03 PM
+ * @author Christian Mueller
+ * @created 21-Feb-2012 4:58:34 PM
*/
struct am_MainSoundProperty_s
{
@@ -672,9 +735,8 @@ 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
+ * @author Christian Mueller
+ * @created 21-Feb-2012 4:58:34 PM
*/
struct am_MainConnectionType_s
{
@@ -689,9 +751,8 @@ namespace am {
};
/**
- * @author christian
- * @version 1.0
- * @created 10-Feb-2012 1:31:03 PM
+ * @author Christian Mueller
+ * @created 21-Feb-2012 4:58:34 PM
*/
struct am_MainConnection_s
{
@@ -713,9 +774,8 @@ namespace am {
};
/**
- * @author christian
- * @version 1.0
- * @created 10-Feb-2012 1:31:03 PM
+ * @author Christian Mueller
+ * @created 21-Feb-2012 4:58:34 PM
*/
struct am_Sink_s
{
@@ -737,9 +797,8 @@ namespace am {
};
/**
- * @author christian
- * @version 1.0
- * @created 10-Feb-2012 1:31:03 PM
+ * @author Christian Mueller
+ * @created 21-Feb-2012 4:58:34 PM
*/
struct am_Source_s
{
@@ -770,9 +829,8 @@ namespace am {
};
/**
- * @author christian
- * @version 1.0
- * @created 10-Feb-2012 1:31:03 PM
+ * @author Christian Mueller
+ * @created 21-Feb-2012 4:58:34 PM
*/
struct am_Domain_s
{
@@ -789,9 +847,8 @@ namespace am {
};
/**
- * @author christian
- * @version 1.0
- * @created 10-Feb-2012 1:31:04 PM
+ * @author Christian Mueller
+ * @created 21-Feb-2012 4:58:34 PM
*/
struct am_Connection_s
{
@@ -809,9 +866,8 @@ namespace am {
* data type depends of am_EarlyDataType_e:
* volume_t in case of ED_SOURCE_VOLUME, ED_SINK_VOLUME
* soundProperty_t in case of ED_SOURCE_PROPERTY, ED_SINK_PROPERTY
- * @author christian
- * @version 1.0
- * @created 10-Feb-2012 1:31:04 PM
+ * @author Christian Mueller
+ * @created 21-Feb-2012 4:58:35 PM
*/
union am_EarlyData_u
{
@@ -826,9 +882,8 @@ namespace am {
* data type depends of am_EarlyDataType_e:
* sourceID in case of ED_SOURCE_VOLUME, ED_SOURCE_PROPERTY
* sinkID in case of ED_SINK_VOLUME, ED_SINK_PROPERTY
- * @author christian
- * @version 1.0
- * @created 10-Feb-2012 1:31:04 PM
+ * @author Christian Mueller
+ * @created 21-Feb-2012 4:58:35 PM
*/
union am_DataType_u
{
@@ -840,9 +895,8 @@ namespace am {
};
/**
- * @author christian
- * @version 1.0
- * @created 10-Feb-2012 1:31:04 PM
+ * @author Christian Mueller
+ * @created 21-Feb-2012 4:58:35 PM
*/
struct am_EarlyData_s
{
@@ -854,4 +908,4 @@ namespace am {
};
}
-#endif // !defined(EA_2D7F1C82_8717_47ce_B755_51DDED15BC18__INCLUDED_)
+#endif // !defined(EA_6D2D8AED_B7CC_424e_8C3F_EB10C5EBDC21__INCLUDED_)
diff --git a/includes/command/CommandReceiveInterface.h b/includes/command/CommandReceiveInterface.h
index 257d5d9..b07ef2e 100644
--- a/includes/command/CommandReceiveInterface.h
+++ b/includes/command/CommandReceiveInterface.h
@@ -10,7 +10,7 @@
*
* \section License
* GNU Lesser General Public License, version 2.1, with special exception (GENIVI clause)
-* Copyright (C) 2011, BMW AG Christian M?ller Christian.ei.mueller@bmw.de
+* Copyright (C) 2011, BMW AG Christian Mueller Christian.ei.mueller@bmw.de
*
* This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation.
* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License, version 2.1, for more details.
@@ -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_C6A85AF3_95A7_4c37_90ED_CA847BA7F31D__INCLUDED_)
-#define EA_C6A85AF3_95A7_4c37_90ED_CA847BA7F31D__INCLUDED_
+#if !defined(EA_241FAB0A_6108_4f68_8AAD_F2218B1C41D9__INCLUDED_)
+#define EA_241FAB0A_6108_4f68_8AAD_F2218B1C41D9__INCLUDED_
#include <vector>
#include <string>
@@ -34,13 +34,16 @@ class SocketHandler;
}
-#define CommandReceiveVersion 1
+#define CommandReceiveVersion 1.0
namespace am {
/**
- * The interface towards the Controlling Instance (e.g HMI). It handles the communication towards the HMI and other system components who need to interact with the audiomanagement.
- * @author christian
- * @version 1.0
- * @created 10-Feb-2012 1:31:04 PM
+ * The interface towards the Controlling Instance (e.g HMI). It handles the communication towards the HMI and other system components who need to interact with the audiomanagement.
+ * There are two rules that have to be kept in mind when implementing against this interface:
+ * 1. CALLS TO THIS INTERFACE ARE NOT THREAD SAFE !!!!
+ * 2. YOU MAY NOT THE CALLING INTERFACE DURING AN SYNCHRONOUS OR ASYNCHRONOUS CALL THAT EXPECTS A RETURN VALUE.
+ * Violation these rules may lead to unexpected behavior! Nevertheless you can implement thread safe by using the deferred-call pattern described on the wiki which also helps to implement calls that are forbidden.
+ * @author Christian Mueller
+ * @created 21-Feb-2012 4:58:35 PM
*/
class CommandReceiveInterface
{
@@ -204,4 +207,4 @@ namespace am {
};
}
-#endif // !defined(EA_C6A85AF3_95A7_4c37_90ED_CA847BA7F31D__INCLUDED_)
+#endif // !defined(EA_241FAB0A_6108_4f68_8AAD_F2218B1C41D9__INCLUDED_)
diff --git a/includes/command/CommandSendInterface.h b/includes/command/CommandSendInterface.h
index bd970d0..f8c47be 100644
--- a/includes/command/CommandSendInterface.h
+++ b/includes/command/CommandSendInterface.h
@@ -10,7 +10,7 @@
*
* \section License
* GNU Lesser General Public License, version 2.1, with special exception (GENIVI clause)
-* Copyright (C) 2011, BMW AG Christian M?ller Christian.ei.mueller@bmw.de
+* Copyright (C) 2011, BMW AG Christian Mueller Christian.ei.mueller@bmw.de
*
* This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation.
* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License, version 2.1, for more details.
@@ -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_1EBB5273_A222_43b8_B7C9_435405DF9AA2__INCLUDED_)
-#define EA_1EBB5273_A222_43b8_B7C9_435405DF9AA2__INCLUDED_
+#if !defined(EA_A230EB7E_1719_4470_BCC6_12B0606A80E6__INCLUDED_)
+#define EA_A230EB7E_1719_4470_BCC6_12B0606A80E6__INCLUDED_
#include <vector>
#include <string>
@@ -35,13 +35,16 @@ class CommandReceiveInterface;
#include "CommandReceiveInterface.h"
-#define CommandSendVersion 1
+#define CommandSendVersion 1.0
namespace am {
/**
- * This interface handles all communication from the AudioManagerDaemon towards the system. It is designed in such a way that only callbacks with no return types are implemented. So when the CommandInterfacePlugins are designed in such a way that they broadcast signals to any node who is interested in the particular information (like signals on Dbus for example), more information can be retrieved via the CommandReceiveInterface.
- * @author christian
- * @version 1.0
- * @created 10-Feb-2012 1:31:05 PM
+ * This interface handles all communication from the AudioManagerDaemon towards the system. It is designed in such a way that only callbacks with no return types are implemented. So when the CommandInterfacePlugins are designed in such a way that they broadcast signals to any node who is interested in the particular information (like signals on Dbus for example), more information can be retrieved via the CommandReceiveInterface.
+ * There are two rules that have to be kept in mind when implementing against this interface:
+ * 1. CALLS TO THIS INTERFACE ARE NOT THREAD SAFE !!!!
+ * 2. YOU MAY NOT THE CALLING INTERFACE DURING AN SYNCHRONOUS OR ASYNCHRONOUS CALL THAT EXPECTS A RETURN VALUE.
+ * Violation these rules may lead to unexpected behavior! Nevertheless you can implement thread safe by using the deferred-call pattern described on the wiki which also helps to implement calls that are forbidden.
+ * @author Christian Mueller
+ * @created 21-Feb-2012 4:58:36 PM
*/
class CommandSendInterface
{
@@ -165,4 +168,4 @@ namespace am {
};
}
-#endif // !defined(EA_1EBB5273_A222_43b8_B7C9_435405DF9AA2__INCLUDED_)
+#endif // !defined(EA_A230EB7E_1719_4470_BCC6_12B0606A80E6__INCLUDED_)
diff --git a/includes/config.h b/includes/config.h
deleted file mode 100644
index a055ddd..0000000
--- a/includes/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef _CONFIG_H
-#define _CONFIG_H
-
-#define DAEMONVERSION "ver-0.0.9-14-g2ddacca"
-
-#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/control/ControlReceiveInterface.h b/includes/control/ControlReceiveInterface.h
index d01327b..a3ec949 100644
--- a/includes/control/ControlReceiveInterface.h
+++ b/includes/control/ControlReceiveInterface.h
@@ -10,7 +10,7 @@
*
* \section License
* GNU Lesser General Public License, version 2.1, with special exception (GENIVI clause)
-* Copyright (C) 2011, BMW AG Christian M?ller Christian.ei.mueller@bmw.de
+* Copyright (C) 2011, BMW AG Christian Mueller Christian.ei.mueller@bmw.de
*
* This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation.
* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License, version 2.1, for more details.
@@ -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_C0D10ABE_48CA_4a18_9932_CB970D9C3723__INCLUDED_)
-#define EA_C0D10ABE_48CA_4a18_9932_CB970D9C3723__INCLUDED_
+#if !defined(EA_E6BEDBFE_083F_4174_8B46_FDDAEE627EB3__INCLUDED_)
+#define EA_E6BEDBFE_083F_4174_8B46_FDDAEE627EB3__INCLUDED_
#include <vector>
#include <string>
@@ -33,13 +33,16 @@ class SocketHandler;
}
-#define ControlReceiveVersion 1
+#define ControlReceiveVersion 1.0
namespace am {
/**
- * This interface gives access to all important functions of the audiomanager that are used by the AudioManagerController to control the system.
- * @author christian
- * @version 1.0
- * @created 10-Feb-2012 1:31:05 PM
+ * This interface gives access to all important functions of the audiomanager that are used by the AudioManagerController to control the system.
+ * There are two rules that have to be kept in mind when implementing against this interface:
+ * 1. CALLS TO THIS INTERFACE ARE NOT THREAD SAFE !!!!
+ * 2. YOU MAY NOT THE CALLING INTERFACE DURING AN SYNCHRONOUS OR ASYNCHRONOUS CALL THAT EXPECTS A RETURN VALUE.
+ * Violation these rules may lead to unexpected behavior! Nevertheless you can implement thread safe by using the deferred-call pattern described on the wiki which also helps to implement calls that are forbidden.
+ * @author Christian Mueller
+ * @created 21-Feb-2012 4:58:36 PM
*/
class ControlReceiveInterface
{
@@ -577,10 +580,18 @@ namespace am {
*/
virtual void setCommandReady() =0;
/**
+ * sets the command interface into the rundown state
+ */
+ virtual void setCommandRundown() =0;
+ /**
* sets the routinginterface to ready.
*/
virtual void setRoutingReady() =0;
/**
+ * sets the routinginterface to the rundown state
+ */
+ virtual void setRoutingRundown() =0;
+ /**
* This function returns the pointer to the socketHandler. This can be used to integrate socket-based activites like communication with the mainloop of the AudioManager.
* returns E_OK if pointer is valid, E_UNKNOWN in case AudioManager was compiled without socketHandler support,
*
@@ -594,4 +605,4 @@ namespace am {
};
}
-#endif // !defined(EA_C0D10ABE_48CA_4a18_9932_CB970D9C3723__INCLUDED_)
+#endif // !defined(EA_E6BEDBFE_083F_4174_8B46_FDDAEE627EB3__INCLUDED_)
diff --git a/includes/control/ControlSendInterface.h b/includes/control/ControlSendInterface.h
index 2d49593..79aeb71 100644
--- a/includes/control/ControlSendInterface.h
+++ b/includes/control/ControlSendInterface.h
@@ -10,7 +10,7 @@
*
* \section License
* GNU Lesser General Public License, version 2.1, with special exception (GENIVI clause)
-* Copyright (C) 2011, BMW AG Christian M?ller Christian.ei.mueller@bmw.de
+* Copyright (C) 2011, BMW AG Christian Mueller Christian.ei.mueller@bmw.de
*
* This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation.
* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License, version 2.1, for more details.
@@ -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_F931365D_53A0_4830_8B3E_29C95C767ADC__INCLUDED_)
-#define EA_F931365D_53A0_4830_8B3E_29C95C767ADC__INCLUDED_
+#if !defined(EA_71CB967F_6C92_467f_99BE_B9F5210165C2__INCLUDED_)
+#define EA_71CB967F_6C92_467f_99BE_B9F5210165C2__INCLUDED_
#include <vector>
#include <string>
@@ -33,14 +33,17 @@ namespace am {
class ControlReceiveInterface;
}
-#define ControlSendVersion 1
+#define ControlSendVersion 1.0
namespace am {
/**
* This interface is presented by the AudioManager controller.
- * All the hooks represent system events that need to be handled. The callback functions are used to handle for example answers to function calls on the AudioManagerCoreInterface.
- * @author christian
- * @version 1.0
- * @created 10-Feb-2012 1:31:06 PM
+ * All the hooks represent system events that need to be handled. The callback functions are used to handle for example answers to function calls on the AudioManagerCoreInterface.
+ * There are two rules that have to be kept in mind when implementing against this interface:
+ * 1. CALLS TO THIS INTERFACE ARE NOT THREAD SAFE !!!!
+ * 2. YOU MAY NOT THE CALLING INTERFACE DURING AN SYNCHRONOUS OR ASYNCHRONOUS CALL THAT EXPECTS A RETURN VALUE.
+ * Violation these rules may lead to unexpected behavior! Nevertheless you can implement thread safe by using the deferred-call pattern described on the wiki which also helps to implement calls that are forbidden.
+ * @author Christian Mueller
+ * @created 21-Feb-2012 4:58:37 PM
*/
class ControlSendInterface
{
@@ -355,10 +358,11 @@ namespace am {
*
* @param sourceID sourceID of source that shall be connected
* @param sinkID sinkID of sink that shall be connected
+ * @param listRoute This route is the one the priorized connectionFormats is for.
* @param listPossibleConnectionFormats list of possible connectionformats
* @param listPrioConnectionFormats the list return with prioos from the controller. Best choice on first position.
*/
- virtual am_Error_e getConnectionFormatChoice(const am_sourceID_t sourceID, const am_sinkID_t sinkID, const std::vector<am_ConnectionFormat_e> listPossibleConnectionFormats, std::vector<am_ConnectionFormat_e>& listPrioConnectionFormats) =0;
+ virtual am_Error_e getConnectionFormatChoice(const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_Route_s listRoute, const std::vector<am_ConnectionFormat_e> listPossibleConnectionFormats, std::vector<am_ConnectionFormat_e>& listPrioConnectionFormats) =0;
/**
* This function returns the version of the interface
* returns E_OK, E_UNKOWN if version is unknown.
@@ -367,4 +371,4 @@ namespace am {
};
}
-#endif // !defined(EA_F931365D_53A0_4830_8B3E_29C95C767ADC__INCLUDED_)
+#endif // !defined(EA_71CB967F_6C92_467f_99BE_B9F5210165C2__INCLUDED_)
diff --git a/includes/projecttypes.h b/includes/projecttypes.h
index 2f84f4c..dd55451 100644
--- a/includes/projecttypes.h
+++ b/includes/projecttypes.h
@@ -10,7 +10,7 @@
*
* \section License
* GNU Lesser General Public License, version 2.1, with special exception (GENIVI clause)
-* Copyright (C) 2011, BMW AG Christian M?ller Christian.ei.mueller@bmw.de
+* Copyright (C) 2011, BMW AG Christian Mueller Christian.ei.mueller@bmw.de
*
* This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation.
* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License, version 2.1, for more details.
@@ -22,132 +22,187 @@
*
* 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_8A329625_1F6F_478f_A704_D5359425FB4E__INCLUDED_)
+#define EA_8A329625_1F6F_478f_A704_D5359425FB4E__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
+ * @author Christian Mueller
+ * @created 21-Feb-2012 4:58:35 PM
*/
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
+ * @author Christian Mueller
+ * @created 21-Feb-2012 4:58:35 PM
*/
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
+ * @author Christian Mueller
+ * @created 21-Feb-2012 4:58:35 PM
*/
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
};
/**
* 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
- * @version 1.0
- * @created 26-Jan-2012 6:00:52 PM
+ * @author Christian Mueller
+ * @created 21-Feb-2012 4:58:35 PM
*/
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
+ * @author Christian Mueller
+ * @created 21-Feb-2012 4:58:35 PM
*/
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
+ * @author Christian Mueller
+ * @created 21-Feb-2012 4:58:35 PM
*/
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
+ * @author Christian Mueller
+ * @created 21-Feb-2012 4:58:35 PM
*/
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_8A329625_1F6F_478f_A704_D5359425FB4E__INCLUDED_)
diff --git a/includes/routing/RoutingReceiveInterface.h b/includes/routing/RoutingReceiveInterface.h
index 00e4666..f9df264 100644
--- a/includes/routing/RoutingReceiveInterface.h
+++ b/includes/routing/RoutingReceiveInterface.h
@@ -10,7 +10,7 @@
*
* \section License
* GNU Lesser General Public License, version 2.1, with special exception (GENIVI clause)
-* Copyright (C) 2011, BMW AG Christian M?ller Christian.ei.mueller@bmw.de
+* Copyright (C) 2011, BMW AG Christian Mueller Christian.ei.mueller@bmw.de
*
* This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation.
* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License, version 2.1, for more details.
@@ -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_C1FDE688_5CB0_42b2_B2CC_C407D50C2D87__INCLUDED_)
-#define EA_C1FDE688_5CB0_42b2_B2CC_C407D50C2D87__INCLUDED_
+#if !defined(EA_3F1137F5_C65B_42b9_A805_A65B61A04AA1__INCLUDED_)
+#define EA_3F1137F5_C65B_42b9_A805_A65B61A04AA1__INCLUDED_
#include <vector>
#include <string>
@@ -35,13 +35,16 @@ class SocketHandler;
}
-#define RoutingReceiveVersion 1
+#define RoutingReceiveVersion 1.0
namespace am {
/**
- * Routing Receive sendInterface description. This class implements everything from RoutingAdapter -> Audiomanager
- * @author christian
- * @version 1.0
- * @created 10-Feb-2012 1:31:06 PM
+ * Routing Receive sendInterface description. This class implements everything from RoutingAdapter -> Audiomanager
+ * There are two rules that have to be kept in mind when implementing against this interface:
+ * 1. CALLS TO THIS INTERFACE ARE NOT THREAD SAFE !!!!
+ * 2. YOU MAY NOT THE CALLING INTERFACE DURING AN SYNCHRONOUS OR ASYNCHRONOUS CALL THAT EXPECTS A RETURN VALUE.
+ * Violation these rules may lead to unexpected behavior! Nevertheless you can implement thread safe by using the deferred-call pattern described on the wiki which also helps to implement calls that are forbidden.
+ * @author Christian Mueller
+ * @created 21-Feb-2012 4:58:37 PM
*/
class RoutingReceiveInterface
{
@@ -332,4 +335,4 @@ namespace am {
};
}
-#endif // !defined(EA_C1FDE688_5CB0_42b2_B2CC_C407D50C2D87__INCLUDED_)
+#endif // !defined(EA_3F1137F5_C65B_42b9_A805_A65B61A04AA1__INCLUDED_)
diff --git a/includes/routing/RoutingSendInterface.h b/includes/routing/RoutingSendInterface.h
index 35c07cd..b126c56 100644
--- a/includes/routing/RoutingSendInterface.h
+++ b/includes/routing/RoutingSendInterface.h
@@ -10,7 +10,7 @@
*
* \section License
* GNU Lesser General Public License, version 2.1, with special exception (GENIVI clause)
-* Copyright (C) 2011, BMW AG Christian M?ller Christian.ei.mueller@bmw.de
+* Copyright (C) 2011, BMW AG Christian Mueller Christian.ei.mueller@bmw.de
*
* This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation.
* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License, version 2.1, for more details.
@@ -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_E1ED14D4_6A57_4661_8587_FA302E2A9951__INCLUDED_)
-#define EA_E1ED14D4_6A57_4661_8587_FA302E2A9951__INCLUDED_
+#if !defined(EA_E6EBF9D0_B241_44f2_AABB_8DAE02D74E88__INCLUDED_)
+#define EA_E6EBF9D0_B241_44f2_AABB_8DAE02D74E88__INCLUDED_
#include <vector>
#include <string>
@@ -35,13 +35,16 @@ class RoutingReceiveInterface;
#include "RoutingReceiveInterface.h"
-#define RoutingSendVersion 1
+#define RoutingSendVersion 1.0
namespace am {
/**
- * This class implements everything from Audiomanager -> RoutingAdapter
- * @author christian
- * @version 1.0
- * @created 10-Feb-2012 1:31:06 PM
+ * This class implements everything from Audiomanager -> RoutingAdapter
+ * There are two rules that have to be kept in mind when implementing against this interface:
+ * 1. CALLS TO THIS INTERFACE ARE NOT THREAD SAFE !!!!
+ * 2. YOU MAY NOT THE CALLING INTERFACE DURING AN SYNCHRONOUS OR ASYNCHRONOUS CALL THAT EXPECTS A RETURN VALUE.
+ * Violation these rules may lead to unexpected behavior! Nevertheless you can implement thread safe by using the deferred-call pattern described on the wiki which also helps to implement calls that are forbidden.
+ * @author Christian Mueller
+ * @created 21-Feb-2012 4:58:37 PM
*/
class RoutingSendInterface
{
@@ -196,4 +199,4 @@ namespace am {
};
}
-#endif // !defined(EA_E1ED14D4_6A57_4661_8587_FA302E2A9951__INCLUDED_)
+#endif // !defined(EA_E6EBF9D0_B241_44f2_AABB_8DAE02D74E88__INCLUDED_)
View Lorry Controller Status