diff options
Diffstat (limited to 'includes')
-rw-r--r-- | includes/SocketHandler.h | 2 | ||||
-rw-r--r-- | includes/audiomanagertypes.h | 100 | ||||
-rw-r--r-- | includes/command/CommandReceiveInterface.h | 18 | ||||
-rw-r--r-- | includes/command/CommandSendInterface.h | 22 | ||||
-rw-r--r-- | includes/config.h | 2 | ||||
-rw-r--r-- | includes/control/ControlReceiveInterface.h | 18 | ||||
-rw-r--r-- | includes/control/ControlSendInterface.h | 18 | ||||
-rw-r--r-- | includes/dbus/DBusWrapper.h | 6 | ||||
-rw-r--r-- | includes/projecttypes.h | 20 | ||||
-rw-r--r-- | includes/routing/RoutingReceiveInterface.h | 18 | ||||
-rw-r--r-- | includes/routing/RoutingSendInterface.h | 34 |
11 files changed, 153 insertions, 105 deletions
diff --git a/includes/SocketHandler.h b/includes/SocketHandler.h index e7e80ba..2a20af6 100644 --- a/includes/SocketHandler.h +++ b/includes/SocketHandler.h @@ -130,8 +130,8 @@ private: sh_timerHandle_t mNextTimer; sh_timerHandle_t mLastInsertedHandle; sh_pollHandle_t mLastInsertedPollHandle; - timespec mTimeout; bool mRecreatePollfds; + timespec mTimeout; }; /** diff --git a/includes/audiomanagertypes.h b/includes/audiomanagertypes.h index 228c848..6c39ad8 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_3B272E4F_E824_49e3_862F_3C86FD59D14B__INCLUDED_)
-#define EA_3B272E4F_E824_49e3_862F_3C86FD59D14B__INCLUDED_
+#if !defined(EA_C4520781_52CF_4636_BE82_37A28F483C93__INCLUDED_)
+#define EA_C4520781_52CF_4636_BE82_37A28F483C93__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 19-Jan-2012 4:31:47 PM + * @created 26-Jan-2012 6:00:48 PM */ typedef uint16_t am_domainID_t; /** * @author christian * @version 1.0 - * @created 19-Jan-2012 4:31:47 PM + * @created 26-Jan-2012 6:00:48 PM */ typedef uint16_t am_sourceID_t; /** * @author christian * @version 1.0 - * @created 19-Jan-2012 4:31:48 PM + * @created 26-Jan-2012 6:00:48 PM */ typedef uint16_t am_sinkID_t; /** * @author christian * @version 1.0 - * @created 19-Jan-2012 4:31:48 PM + * @created 26-Jan-2012 6:00:48 PM */ typedef uint16_t am_gatewayID_t; /** * @author christian * @version 1.0 - * @created 19-Jan-2012 4:31:48 PM + * @created 26-Jan-2012 6:00:48 PM */ typedef uint16_t am_crossfaderID_t; /** * @author christian * @version 1.0 - * @created 19-Jan-2012 4:31:48 PM + * @created 26-Jan-2012 6:00:48 PM */ typedef uint16_t am_connectionID_t; /** * @author christian * @version 1.0 - * @created 19-Jan-2012 4:31:49 PM + * @created 26-Jan-2012 6:00:48 PM */ typedef uint16_t am_mainConnectionID_t; /** * @author christian * @version 1.0 - * @created 19-Jan-2012 4:31:49 PM + * @created 26-Jan-2012 6:00:48 PM */ 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 19-Jan-2012 4:31:49 PM + * @created 26-Jan-2012 6:00:48 PM */ 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 19-Jan-2012 4:31:49 PM + * @created 26-Jan-2012 6:00:48 PM */ typedef int16_t am_mainVolume_t; /** * @author christian * @version 1.0 - * @created 19-Jan-2012 4:31:50 PM + * @created 26-Jan-2012 6:00:48 PM */ typedef uint16_t am_sourceClass_t; /** * @author christian * @version 1.0 - * @created 19-Jan-2012 4:31:50 PM + * @created 26-Jan-2012 6:00:48 PM */ typedef uint16_t am_sinkClass_t; @@ -212,7 +212,7 @@ namespace am { * time in ms! * @author christian * @version 1.0 - * @created 19-Jan-2012 4:31:50 PM + * @created 26-Jan-2012 6:00:48 PM */ 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 19-Jan-2012 4:31:50 PM + * @created 26-Jan-2012 6:00:48 PM */ typedef int16_t am_timeSync_t; @@ -228,7 +228,7 @@ namespace am { * with the help of this enum, sinks and sources can report their availability state * @author christian * @version 1.0 - * @created 19-Jan-2012 4:31:50 PM + * @created 26-Jan-2012 6:00:48 PM */ enum am_Availablility_e { @@ -243,7 +243,7 @@ namespace am { * represents the connection state * @author christian * @version 1.0 - * @created 19-Jan-2012 4:31:50 PM + * @created 26-Jan-2012 6:00:48 PM */ enum am_ConnectionState_e { @@ -274,7 +274,7 @@ namespace am { /** * @author christian * @version 1.0 - * @created 19-Jan-2012 4:31:51 PM + * @created 26-Jan-2012 6:00:48 PM */ enum am_DomainState_e { @@ -289,7 +289,7 @@ namespace am { * This enum characterizes the data of the EarlyData_t * @author christian * @version 1.0 - * @created 19-Jan-2012 4:31:51 PM + * @created 26-Jan-2012 6:00:48 PM */ enum am_EarlyDataType_e { @@ -305,7 +305,7 @@ namespace am { * 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 19-Jan-2012 4:31:51 PM + * @created 26-Jan-2012 6:00:48 PM */ enum am_Error_e { @@ -330,7 +330,7 @@ namespace am { /** * @author christian * @version 1.0 - * @created 19-Jan-2012 4:31:51 PM + * @created 26-Jan-2012 6:00:48 PM */ enum am_MuteState_e { @@ -344,7 +344,7 @@ namespace am { * The source state reflects the state of the source * @author christian * @version 1.0 - * @created 19-Jan-2012 4:31:52 PM + * @created 26-Jan-2012 6:00:48 PM */ enum am_SourceState_e { @@ -368,7 +368,7 @@ namespace am { * This enumeration is used to define the type of the action that is correlated to a handle. * @author christian * @version 1.0 - * @created 19-Jan-2012 4:31:52 PM + * @created 26-Jan-2012 6:00:48 PM */ enum am_Handle_e { @@ -389,7 +389,7 @@ namespace am { /** * @author christian * @version 1.0 - * @created 19-Jan-2012 4:31:52 PM + * @created 26-Jan-2012 6:00:48 PM */ enum am_InterruptState_e { @@ -403,7 +403,7 @@ namespace am { * describes the active sink of a crossfader. * @author christian * @version 1.0 - * @created 19-Jan-2012 4:31:52 PM + * @created 26-Jan-2012 6:00:49 PM */ enum am_HotSink_e { @@ -418,7 +418,7 @@ namespace am { * this describes the availability of a sink or a source together with the latest change * @author christian * @version 1.0 - * @created 19-Jan-2012 4:31:52 PM + * @created 26-Jan-2012 6:00:49 PM */ struct am_Availability_s { @@ -438,7 +438,7 @@ namespace am { /** * @author christian * @version 1.0 - * @created 19-Jan-2012 4:31:53 PM + * @created 26-Jan-2012 6:00:49 PM */ struct am_ClassProperty_s { @@ -452,7 +452,7 @@ namespace am { /** * @author christian * @version 1.0 - * @created 19-Jan-2012 4:31:53 PM + * @created 26-Jan-2012 6:00:49 PM */ struct am_Crossfader_s { @@ -470,7 +470,7 @@ namespace am { /** * @author christian * @version 1.0 - * @created 19-Jan-2012 4:31:53 PM + * @created 26-Jan-2012 6:00:49 PM */ struct am_Gateway_s { @@ -511,7 +511,7 @@ namespace am { * This represents one "hopp" in a route * @author christian * @version 1.0 - * @created 19-Jan-2012 4:31:54 PM + * @created 26-Jan-2012 6:00:49 PM */ struct am_RoutingElement_s { @@ -527,7 +527,7 @@ namespace am { /** * @author christian * @version 1.0 - * @created 19-Jan-2012 4:31:54 PM + * @created 26-Jan-2012 6:00:49 PM */ struct am_Route_s { @@ -542,7 +542,7 @@ namespace am { /** * @author christian * @version 1.0 - * @created 19-Jan-2012 4:31:54 PM + * @created 26-Jan-2012 6:00:49 PM */ struct am_SoundProperty_s { @@ -556,7 +556,7 @@ namespace am { /** * @author christian * @version 1.0 - * @created 19-Jan-2012 4:31:55 PM + * @created 26-Jan-2012 6:00:49 PM */ struct am_SystemProperty_s { @@ -576,7 +576,7 @@ namespace am { /** * @author christian * @version 1.0 - * @created 19-Jan-2012 4:31:55 PM + * @created 26-Jan-2012 6:00:50 PM */ struct am_SinkClass_s { @@ -591,7 +591,7 @@ namespace am { /** * @author christian * @version 1.0 - * @created 19-Jan-2012 4:31:55 PM + * @created 26-Jan-2012 6:00:50 PM */ struct am_SourceClass_s { @@ -610,7 +610,7 @@ namespace am { * this type holds all information of sources relevant to the HMI * @author christian * @version 1.0 - * @created 19-Jan-2012 4:31:55 PM + * @created 26-Jan-2012 6:00:50 PM */ struct am_SourceType_s { @@ -627,7 +627,7 @@ namespace am { * this type holds all information of sinks relevant to the HMI * @author christian * @version 1.0 - * @created 19-Jan-2012 4:31:56 PM + * @created 26-Jan-2012 6:00:50 PM */ struct am_SinkType_s { @@ -645,7 +645,7 @@ namespace am { /** * @author christian * @version 1.0 - * @created 19-Jan-2012 4:31:56 PM + * @created 26-Jan-2012 6:00:50 PM */ struct am_Handle_s { @@ -659,7 +659,7 @@ namespace am { /** * @author christian * @version 1.0 - * @created 19-Jan-2012 4:31:56 PM + * @created 26-Jan-2012 6:00:50 PM */ struct am_MainSoundProperty_s { @@ -674,7 +674,7 @@ namespace am { * this type holds all information of connections relevant to the HMI * @author christian * @version 1.0 - * @created 19-Jan-2012 4:31:57 PM + * @created 26-Jan-2012 6:00:50 PM */ struct am_MainConnectionType_s { @@ -691,7 +691,7 @@ namespace am { /** * @author christian * @version 1.0 - * @created 19-Jan-2012 4:31:57 PM + * @created 26-Jan-2012 6:00:50 PM */ struct am_MainConnection_s { @@ -707,7 +707,7 @@ namespace am { /** * @author christian * @version 1.0 - * @created 19-Jan-2012 4:31:57 PM + * @created 26-Jan-2012 6:00:51 PM */ struct am_Sink_s { @@ -731,7 +731,7 @@ namespace am { /** * @author christian * @version 1.0 - * @created 19-Jan-2012 4:31:58 PM + * @created 26-Jan-2012 6:00:51 PM */ struct am_Source_s { @@ -764,7 +764,7 @@ namespace am { /** * @author christian * @version 1.0 - * @created 19-Jan-2012 4:31:58 PM + * @created 26-Jan-2012 6:00:51 PM */ struct am_Domain_s { @@ -783,7 +783,7 @@ namespace am { /** * @author christian * @version 1.0 - * @created 19-Jan-2012 4:31:59 PM + * @created 26-Jan-2012 6:00:51 PM */ struct am_Connection_s { @@ -803,7 +803,7 @@ namespace am { * soundProperty_t in case of ED_SOURCE_PROPERTY, ED_SINK_PROPERTY * @author christian * @version 1.0 - * @created 19-Jan-2012 4:31:59 PM + * @created 26-Jan-2012 6:00:51 PM */ union am_EarlyData_u { @@ -820,7 +820,7 @@ namespace am { * sinkID in case of ED_SINK_VOLUME, ED_SINK_PROPERTY * @author christian * @version 1.0 - * @created 19-Jan-2012 4:31:59 PM + * @created 26-Jan-2012 6:00:51 PM */ union am_DataType_u { @@ -834,7 +834,7 @@ namespace am { /** * @author christian * @version 1.0 - * @created 19-Jan-2012 4:31:59 PM + * @created 26-Jan-2012 6:00:51 PM */ struct am_EarlyData_s { @@ -846,4 +846,4 @@ namespace am { }; } -#endif // !defined(EA_3B272E4F_E824_49e3_862F_3C86FD59D14B__INCLUDED_) +#endif // !defined(EA_C4520781_52CF_4636_BE82_37A28F483C93__INCLUDED_) diff --git a/includes/command/CommandReceiveInterface.h b/includes/command/CommandReceiveInterface.h index 8821898..20e4455 100644 --- a/includes/command/CommandReceiveInterface.h +++ b/includes/command/CommandReceiveInterface.h @@ -22,12 +22,12 @@ *
* THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN
*/
-#if !defined(EA_434BDFE9_DDA7_4273_AF1E_77AE60CB055D__INCLUDED_)
-#define EA_434BDFE9_DDA7_4273_AF1E_77AE60CB055D__INCLUDED_
+#if !defined(EA_6FE1E594_3CEA_4eaa_BAD0_7BB39D3150D2__INCLUDED_)
+#define EA_6FE1E594_3CEA_4eaa_BAD0_7BB39D3150D2__INCLUDED_
#include <vector>
#include <string>
-#include "../audiomanagertypes.h"
+#include "audiomanagertypes.h"
namespace am {
class DBusWrapper;
class SocketHandler;
@@ -40,12 +40,20 @@ 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 19-Jan-2012 4:32:00 PM + * @created 26-Jan-2012 6:00:52 PM */ class CommandReceiveInterface { public: + CommandReceiveInterface() { + + } + + virtual ~CommandReceiveInterface() { + + } + /** * connects a source to sink
* @return E_OK on success, E_NOT_POSSIBLE on failure, E_ALREADY_EXISTS if the connection does already exists @@ -196,4 +204,4 @@ namespace am { }; } -#endif // !defined(EA_434BDFE9_DDA7_4273_AF1E_77AE60CB055D__INCLUDED_) +#endif // !defined(EA_6FE1E594_3CEA_4eaa_BAD0_7BB39D3150D2__INCLUDED_) diff --git a/includes/command/CommandSendInterface.h b/includes/command/CommandSendInterface.h index 160db6c..f1ec602 100644 --- a/includes/command/CommandSendInterface.h +++ b/includes/command/CommandSendInterface.h @@ -22,12 +22,12 @@ *
* THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN
*/
-#if !defined(EA_55B59518_08CD_47c3_91EC_B59681773D46__INCLUDED_)
-#define EA_55B59518_08CD_47c3_91EC_B59681773D46__INCLUDED_
+#if !defined(EA_B298DDFD_7AC9_4a18_BB8C_595921C525B6__INCLUDED_)
+#define EA_B298DDFD_7AC9_4a18_BB8C_595921C525B6__INCLUDED_
#include <vector>
#include <string>
-#include "../audiomanagertypes.h"
+#include "audiomanagertypes.h"
namespace am {
class CommandReceiveInterface;
@@ -41,12 +41,20 @@ 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 19-Jan-2012 4:32:00 PM + * @created 26-Jan-2012 6:00:52 PM */ class CommandSendInterface { public: + CommandSendInterface() { + + } + + virtual ~CommandSendInterface() { + + } + /** * This command starts the interface, the plugin itself. This is not meant to start communication with the HMI itself. It is a good idea to implement here everything that sets up the basic communication like DbusCommunication etc...
* @return E_OK on success, E_UNKNOWN on error @@ -145,10 +153,10 @@ namespace am { /** * CommandReceiveVer_0.0.9. * - * @param time * @param mainConnectionID + * @param time */ - virtual void cbTimingInformationChanged(const am_timeSync_t time, const am_mainConnectionID_t mainConnectionID) =0; + virtual void cbTimingInformationChanged(const am_mainConnectionID_t mainConnectionID, const am_timeSync_t time) =0; /** * This function returns the version of the interface
* returns E_OK, E_UNKOWN if version is unknown. @@ -157,4 +165,4 @@ namespace am { }; } -#endif // !defined(EA_55B59518_08CD_47c3_91EC_B59681773D46__INCLUDED_) +#endif // !defined(EA_B298DDFD_7AC9_4a18_BB8C_595921C525B6__INCLUDED_) diff --git a/includes/config.h b/includes/config.h index 754b1e9..920b050 100644 --- a/includes/config.h +++ b/includes/config.h @@ -1,7 +1,7 @@ #ifndef _CONFIG_H #define _CONFIG_H -#define DAEMONVERSION "ver-0.0.1-14-gaf0ba5b" +#define DAEMONVERSION "ver-0.0.1-16-g002295b" #define WITH_DBUS_WRAPPER #define WITH_SOCKETHANDLER_LOOP diff --git a/includes/control/ControlReceiveInterface.h b/includes/control/ControlReceiveInterface.h index 85fda32..4a2334c 100644 --- a/includes/control/ControlReceiveInterface.h +++ b/includes/control/ControlReceiveInterface.h @@ -22,12 +22,12 @@ *
* THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN
*/
-#if !defined(EA_E6AC61AD_E107_4b3d_8E11_9A434157C19F__INCLUDED_)
-#define EA_E6AC61AD_E107_4b3d_8E11_9A434157C19F__INCLUDED_
+#if !defined(EA_9550F257_23AE_4781_B149_0E4B3A9889AC__INCLUDED_)
+#define EA_9550F257_23AE_4781_B149_0E4B3A9889AC__INCLUDED_
#include <vector>
#include <string>
-#include "../audiomanagertypes.h"
+#include "audiomanagertypes.h"
namespace am {
class SocketHandler;
}
@@ -39,12 +39,20 @@ 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 19-Jan-2012 4:32:00 PM + * @created 26-Jan-2012 6:00:52 PM */ class ControlReceiveInterface { public: + ControlReceiveInterface() { + + } + + virtual ~ControlReceiveInterface() { + + } + /** * calculates a route from source to sink.
* @return E_OK on success, E_UNKNOWN on error @@ -562,4 +570,4 @@ namespace am { }; } -#endif // !defined(EA_E6AC61AD_E107_4b3d_8E11_9A434157C19F__INCLUDED_) +#endif // !defined(EA_9550F257_23AE_4781_B149_0E4B3A9889AC__INCLUDED_) diff --git a/includes/control/ControlSendInterface.h b/includes/control/ControlSendInterface.h index 9c1fa7a..401d176 100644 --- a/includes/control/ControlSendInterface.h +++ b/includes/control/ControlSendInterface.h @@ -22,12 +22,12 @@ *
* THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN
*/
-#if !defined(EA_7E13E25E_46FA_4211_BD7C_7169D8F7D065__INCLUDED_)
-#define EA_7E13E25E_46FA_4211_BD7C_7169D8F7D065__INCLUDED_
+#if !defined(EA_7C94464D_AE95_434a_A108_201C19F97A85__INCLUDED_)
+#define EA_7C94464D_AE95_434a_A108_201C19F97A85__INCLUDED_
#include <vector>
#include <string>
-#include "../audiomanagertypes.h"
+#include "audiomanagertypes.h"
namespace am {
class ControlReceiveInterface;
@@ -40,12 +40,20 @@ namespace am { * 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 19-Jan-2012 4:32:01 PM + * @created 26-Jan-2012 6:00:53 PM */ class ControlSendInterface { public: + ControlSendInterface() { + + } + + virtual ~ControlSendInterface() { + + } + /** * Starts up the controller. * @@ -359,4 +367,4 @@ namespace am { }; } -#endif // !defined(EA_7E13E25E_46FA_4211_BD7C_7169D8F7D065__INCLUDED_) +#endif // !defined(EA_7C94464D_AE95_434a_A108_201C19F97A85__INCLUDED_) diff --git a/includes/dbus/DBusWrapper.h b/includes/dbus/DBusWrapper.h index 528d111..24b2795 100644 --- a/includes/dbus/DBusWrapper.h +++ b/includes/dbus/DBusWrapper.h @@ -75,12 +75,12 @@ public: bool dbusDispatchCallback(const sh_pollHandle_t handle, void* userData); shPollDispatch_T<DBusWrapper> pDbusDispatchCallback; - bool dbusCheckCallback(const sh_pollHandle_t handle, void* userData); - shPollCheck_T<DBusWrapper> pDbusCheckCallback; - void dbusFireCallback(const pollfd pollfd, const sh_pollHandle_t handle, void* userData); shPollFired_T<DBusWrapper> pDbusFireCallback; + bool dbusCheckCallback(const sh_pollHandle_t handle, void* userData); + shPollCheck_T<DBusWrapper> pDbusCheckCallback; + void dbusTimerCallback(sh_timerHandle_t handle, void* userData); shTimerCallBack_T<DBusWrapper> pDbusTimerCallback; diff --git a/includes/projecttypes.h b/includes/projecttypes.h index 6e463b9..8ad8bfa 100644 --- a/includes/projecttypes.h +++ b/includes/projecttypes.h @@ -22,15 +22,15 @@ *
* THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN
*/
-#if !defined(EA_D441AD1F_B077_485c_AE04_AF1567A1359F__INCLUDED_)
-#define EA_D441AD1F_B077_485c_AE04_AF1567A1359F__INCLUDED_
+#if !defined(EA_9A582C38_7B95_4ebf_B316_F765C90F29C5__INCLUDED_)
+#define EA_9A582C38_7B95_4ebf_B316_F765C90F29C5__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 19-Jan-2012 4:31:59 PM
+ * @created 26-Jan-2012 6:00:52 PM
*/
enum am_ConnectionFormat_e
{
@@ -45,7 +45,7 @@ namespace am { * This enum gives the information about reason for reason for Source/Sink change
* @author christian
* @version 1.0
- * @created 19-Jan-2012 4:31:59 PM
+ * @created 26-Jan-2012 6:00:52 PM
*/
enum am_AvailabilityReason_e
{
@@ -63,7 +63,7 @@ namespace am { * product specific identifier of property
* @author christian
* @version 1.0
- * @created 19-Jan-2012 4:31:59 PM
+ * @created 26-Jan-2012 6:00:52 PM
*/
enum am_ClassProperty_e
{
@@ -84,7 +84,7 @@ 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 19-Jan-2012 4:31:59 PM + * @created 26-Jan-2012 6:00:52 PM */ enum am_RampType_e { @@ -106,7 +106,7 @@ namespace am { * sound properties. Within genivi only the standard properties are defined, for products these need to be extended. * @author christian * @version 1.0 - * @created 19-Jan-2012 4:31:59 PM + * @created 26-Jan-2012 6:00:52 PM */ enum am_SoundPropertyType_e { @@ -121,7 +121,7 @@ namespace am { * Here are all SoundProperties that can be set via the CommandInterface. Product specific * @author christian * @version 1.0 - * @created 19-Jan-2012 4:31:59 PM + * @created 26-Jan-2012 6:00:52 PM */ enum am_MainSoundPropertyType_e { @@ -138,7 +138,7 @@ namespace am { * describes the different system properties. Project specific * @author christian * @version 1.0 - * @created 19-Jan-2012 4:31:59 PM + * @created 26-Jan-2012 6:00:52 PM */ enum am_SystemPropertyType_e { @@ -147,4 +147,4 @@ namespace am { SYP_MIN = SYP_TEST }; } -#endif // !defined(EA_D441AD1F_B077_485c_AE04_AF1567A1359F__INCLUDED_) +#endif // !defined(EA_9A582C38_7B95_4ebf_B316_F765C90F29C5__INCLUDED_) diff --git a/includes/routing/RoutingReceiveInterface.h b/includes/routing/RoutingReceiveInterface.h index 13752c4..ff33d61 100644 --- a/includes/routing/RoutingReceiveInterface.h +++ b/includes/routing/RoutingReceiveInterface.h @@ -22,12 +22,12 @@ *
* THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN
*/
-#if !defined(EA_5AC7DCDD_B4FD_44d2_8783_CC96D8595F43__INCLUDED_)
-#define EA_5AC7DCDD_B4FD_44d2_8783_CC96D8595F43__INCLUDED_
+#if !defined(EA_6B4A81F5_2BD8_4604_859D_4539E7E95638__INCLUDED_)
+#define EA_6B4A81F5_2BD8_4604_859D_4539E7E95638__INCLUDED_
#include <vector>
#include <string>
-#include "../audiomanagertypes.h"
+#include "audiomanagertypes.h"
namespace am {
class DBusWrapper;
@@ -41,12 +41,20 @@ namespace am { * Routing Receive sendInterface description. This class implements everything from RoutingAdapter -> Audiomanager * @author christian * @version 1.0 - * @created 19-Jan-2012 4:32:01 PM + * @created 26-Jan-2012 6:00:53 PM */ class RoutingReceiveInterface { public: + RoutingReceiveInterface() { + + } + + virtual ~RoutingReceiveInterface() { + + } + /** * acknowledges a asyncConnect * @@ -324,4 +332,4 @@ namespace am { }; } -#endif // !defined(EA_5AC7DCDD_B4FD_44d2_8783_CC96D8595F43__INCLUDED_) +#endif // !defined(EA_6B4A81F5_2BD8_4604_859D_4539E7E95638__INCLUDED_) diff --git a/includes/routing/RoutingSendInterface.h b/includes/routing/RoutingSendInterface.h index ac4b6ab..d046709 100644 --- a/includes/routing/RoutingSendInterface.h +++ b/includes/routing/RoutingSendInterface.h @@ -22,12 +22,12 @@ *
* THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN
*/
-#if !defined(EA_D17051E6_21F6_42a8_A7D0_F996E885E15F__INCLUDED_)
-#define EA_D17051E6_21F6_42a8_A7D0_F996E885E15F__INCLUDED_
+#if !defined(EA_E9CE2BB6_7523_49e4_9B57_31E776765683__INCLUDED_)
+#define EA_E9CE2BB6_7523_49e4_9B57_31E776765683__INCLUDED_
#include <vector>
#include <string>
-#include "../audiomanagertypes.h"
+#include "audiomanagertypes.h"
namespace am {
class RoutingReceiveInterface;
@@ -41,12 +41,20 @@ namespace am { * This class implements everything from Audiomanager -> RoutingAdapter * @author christian * @version 1.0 - * @created 19-Jan-2012 4:32:02 PM + * @created 26-Jan-2012 6:00:54 PM */ class RoutingSendInterface { public: + RoutingSendInterface() { + + } + + virtual ~RoutingSendInterface() { + + } + /** * starts up the interface. In the implementations, here is the best place for init routines. * @@ -124,37 +132,37 @@ namespace am { * @return E_OK on success, E_UNKNOWN on error, E_OUT_OF_RANGE in case the propery value is out of range * * @param handle - * @param listSoundProperties * @param sinkID + * @param listSoundProperties */ - virtual am_Error_e asyncSetSinkSoundProperties(const am_Handle_s handle, const std::vector<am_SoundProperty_s>& listSoundProperties, const am_sinkID_t sinkID) =0; + virtual am_Error_e asyncSetSinkSoundProperties(const am_Handle_s handle, const am_sinkID_t sinkID, const std::vector<am_SoundProperty_s>& listSoundProperties) =0; /** * this function sets the sinksoundproperty.
* @return E_OK on success, E_UNKNOWN on error, E_OUT_OF_RANGE in case the propery value is out of range * * @param handle - * @param soundProperty * @param sinkID + * @param soundProperty */ - virtual am_Error_e asyncSetSinkSoundProperty(const am_Handle_s handle, const am_SoundProperty_s& soundProperty, const am_sinkID_t sinkID) =0; + virtual am_Error_e asyncSetSinkSoundProperty(const am_Handle_s handle, const am_sinkID_t sinkID, const am_SoundProperty_s& soundProperty) =0; /** * this function sets the sourcesoundproperty.
* @return E_OK on success, E_UNKNOWN on error, E_OUT_OF_RANGE in case the propery value is out of range * * @param handle - * @param listSoundProperties * @param sourceID + * @param listSoundProperties */ - virtual am_Error_e asyncSetSourceSoundProperties(const am_Handle_s handle, const std::vector<am_SoundProperty_s>& listSoundProperties, const am_sourceID_t sourceID) =0; + virtual am_Error_e asyncSetSourceSoundProperties(const am_Handle_s handle, const am_sourceID_t sourceID, const std::vector<am_SoundProperty_s>& listSoundProperties) =0; /** * this function sets the sourcesoundproperty.
* @return E_OK on success, E_UNKNOWN on error, E_OUT_OF_RANGE in case the propery value is out of range * * @param handle - * @param soundProperty * @param sourceID + * @param soundProperty */ - virtual am_Error_e asyncSetSourceSoundProperty(const am_Handle_s handle, const am_SoundProperty_s& soundProperty, const am_sourceID_t sourceID) =0; + virtual am_Error_e asyncSetSourceSoundProperty(const am_Handle_s handle, const am_sourceID_t sourceID, const am_SoundProperty_s& soundProperty) =0; /** * this function triggers crossfading.
* @return E_OK on success, E_UNKNOWN on error @@ -188,4 +196,4 @@ namespace am { }; } -#endif // !defined(EA_D17051E6_21F6_42a8_A7D0_F996E885E15F__INCLUDED_) +#endif // !defined(EA_E9CE2BB6_7523_49e4_9B57_31E776765683__INCLUDED_) |