From 4618280b6d777ac7bf3bb5cf5b0ea3f0d9e4b2b7 Mon Sep 17 00:00:00 2001 From: christian mueller Date: Thu, 22 Dec 2011 00:41:48 +0100 Subject: [PATCH] * 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 --- {dbusIncludes => includes}/SocketHandler.h | 0 includes/audiomanagertypes.cpp | 0 includes/audiomanagertypes.h | 100 ++++++++++----------- includes/command/CommandReceiveInterface.h | 20 +++-- includes/command/CommandSendInterface.h | 8 +- includes/control/ControlReceiveInterface.h | 21 +++-- includes/control/ControlSendInterface.h | 8 +- .../dbus}/CommandInterface.xml | 0 .../dbus}/DBusConfiguration.h | 0 {dbusIncludes => includes/dbus}/DBusWrapper.h | 0 includes/projecttypes.h | 20 ++--- includes/routing/RoutingReceiveInterface.h | 35 +++++--- includes/routing/RoutingSendInterface.h | 8 +- 13 files changed, 126 insertions(+), 94 deletions(-) rename {dbusIncludes => includes}/SocketHandler.h (100%) delete mode 100644 includes/audiomanagertypes.cpp rename {dbusIncludes => includes/dbus}/CommandInterface.xml (100%) rename {dbusIncludes => includes/dbus}/DBusConfiguration.h (100%) rename {dbusIncludes => includes/dbus}/DBusWrapper.h (100%) diff --git a/dbusIncludes/SocketHandler.h b/includes/SocketHandler.h similarity index 100% rename from dbusIncludes/SocketHandler.h rename to includes/SocketHandler.h diff --git a/includes/audiomanagertypes.cpp b/includes/audiomanagertypes.cpp deleted file mode 100644 index e69de29..0000000 diff --git a/includes/audiomanagertypes.h b/includes/audiomanagertypes.h index 46fc00a..27764d1 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_AFA9C9DE_BF7D_4bc2_AE65_3747DCA2D732__INCLUDED_) -#define EA_AFA9C9DE_BF7D_4bc2_AE65_3747DCA2D732__INCLUDED_ +#if !defined(EA_9BBD9DCA_BBCF_45e4_8291_45F44B455D62__INCLUDED_) +#define EA_9BBD9DCA_BBCF_45e4_8291_45F44B455D62__INCLUDED_ #include #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 12-Dec-2011 8:33:20 PM + * @created 22-Dec-2011 12:55:04 AM */ typedef uint16_t am_domainID_t; /** * @author christian * @version 1.0 - * @created 12-Dec-2011 8:33:20 PM + * @created 22-Dec-2011 12:55:05 AM */ typedef uint16_t am_sourceID_t; /** * @author christian * @version 1.0 - * @created 12-Dec-2011 8:33:21 PM + * @created 22-Dec-2011 12:55:06 AM */ typedef uint16_t am_sinkID_t; /** * @author christian * @version 1.0 - * @created 12-Dec-2011 8:33:21 PM + * @created 22-Dec-2011 12:55:06 AM */ typedef uint16_t am_gatewayID_t; /** * @author christian * @version 1.0 - * @created 12-Dec-2011 8:33:21 PM + * @created 22-Dec-2011 12:55:06 AM */ typedef uint16_t am_crossfaderID_t; /** * @author christian * @version 1.0 - * @created 12-Dec-2011 8:33:21 PM + * @created 22-Dec-2011 12:55:06 AM */ typedef uint16_t am_connectionID_t; /** * @author christian * @version 1.0 - * @created 12-Dec-2011 8:33:21 PM + * @created 22-Dec-2011 12:55:06 AM */ typedef uint16_t am_mainConnectionID_t; /** * @author christian * @version 1.0 - * @created 12-Dec-2011 8:33:21 PM + * @created 22-Dec-2011 12:55:06 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 12-Dec-2011 8:33:21 PM + * @created 22-Dec-2011 12:55:07 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 12-Dec-2011 8:33:21 PM + * @created 22-Dec-2011 12:55:07 AM */ typedef int16_t am_mainVolume_t; /** * @author christian * @version 1.0 - * @created 12-Dec-2011 8:33:21 PM + * @created 22-Dec-2011 12:55:07 AM */ typedef uint16_t am_sourceClass_t; /** * @author christian * @version 1.0 - * @created 12-Dec-2011 8:33:21 PM + * @created 22-Dec-2011 12:55:07 AM */ typedef uint16_t am_sinkClass_t; @@ -212,7 +212,7 @@ namespace am { * time in ms! * @author christian * @version 1.0 - * @created 12-Dec-2011 8:33:21 PM + * @created 22-Dec-2011 12:55:07 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 12-Dec-2011 8:33:21 PM + * @created 22-Dec-2011 12:55:08 AM */ 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 12-Dec-2011 8:33:21 PM + * @created 22-Dec-2011 12:55:08 AM */ enum am_Availablility_e { @@ -243,7 +243,7 @@ namespace am { * represents the connection state * @author christian * @version 1.0 - * @created 12-Dec-2011 8:33:21 PM + * @created 22-Dec-2011 12:55:08 AM */ enum am_ConnectionState_e { @@ -274,7 +274,7 @@ namespace am { /** * @author christian * @version 1.0 - * @created 12-Dec-2011 8:33:21 PM + * @created 22-Dec-2011 12:55:08 AM */ 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 12-Dec-2011 8:33:21 PM + * @created 22-Dec-2011 12:55:08 AM */ 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 12-Dec-2011 8:33:21 PM + * @created 22-Dec-2011 12:55:09 AM */ enum am_Error_e { @@ -330,7 +330,7 @@ namespace am { /** * @author christian * @version 1.0 - * @created 12-Dec-2011 8:33:21 PM + * @created 22-Dec-2011 12:55:09 AM */ 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 12-Dec-2011 8:33:21 PM + * @created 22-Dec-2011 12:55:09 AM */ 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 12-Dec-2011 8:33:21 PM + * @created 22-Dec-2011 12:55:09 AM */ enum am_Handle_e { @@ -387,7 +387,7 @@ namespace am { /** * @author christian * @version 1.0 - * @created 12-Dec-2011 8:33:21 PM + * @created 22-Dec-2011 12:55:09 AM */ enum am_InterruptState_e { @@ -401,7 +401,7 @@ namespace am { * describes the active sink of a crossfader. * @author christian * @version 1.0 - * @created 12-Dec-2011 8:33:21 PM + * @created 22-Dec-2011 12:55:10 AM */ enum am_HotSink_e { @@ -416,7 +416,7 @@ namespace am { * this describes the availability of a sink or a source together with the latest change * @author christian * @version 1.0 - * @created 12-Dec-2011 8:33:21 PM + * @created 22-Dec-2011 12:55:10 AM */ struct am_Availability_s { @@ -436,7 +436,7 @@ namespace am { /** * @author christian * @version 1.0 - * @created 12-Dec-2011 8:33:21 PM + * @created 22-Dec-2011 12:55:10 AM */ struct am_ClassProperty_s { @@ -450,7 +450,7 @@ namespace am { /** * @author christian * @version 1.0 - * @created 12-Dec-2011 8:33:21 PM + * @created 22-Dec-2011 12:55:10 AM */ struct am_Crossfader_s { @@ -468,7 +468,7 @@ namespace am { /** * @author christian * @version 1.0 - * @created 12-Dec-2011 8:33:21 PM + * @created 22-Dec-2011 12:55:11 AM */ struct am_Gateway_s { @@ -509,7 +509,7 @@ namespace am { * This represents one "hopp" in a route * @author christian * @version 1.0 - * @created 12-Dec-2011 8:33:21 PM + * @created 22-Dec-2011 12:55:11 AM */ struct am_RoutingElement_s { @@ -525,7 +525,7 @@ namespace am { /** * @author christian * @version 1.0 - * @created 12-Dec-2011 8:33:21 PM + * @created 22-Dec-2011 12:55:11 AM */ struct am_Route_s { @@ -540,7 +540,7 @@ namespace am { /** * @author christian * @version 1.0 - * @created 12-Dec-2011 8:33:22 PM + * @created 22-Dec-2011 12:55:12 AM */ struct am_SoundProperty_s { @@ -554,7 +554,7 @@ namespace am { /** * @author christian * @version 1.0 - * @created 12-Dec-2011 8:33:22 PM + * @created 22-Dec-2011 12:55:12 AM */ struct am_SystemProperty_s { @@ -574,7 +574,7 @@ namespace am { /** * @author christian * @version 1.0 - * @created 12-Dec-2011 8:33:22 PM + * @created 22-Dec-2011 12:55:12 AM */ struct am_SinkClass_s { @@ -589,7 +589,7 @@ namespace am { /** * @author christian * @version 1.0 - * @created 12-Dec-2011 8:33:22 PM + * @created 22-Dec-2011 12:55:12 AM */ struct am_SourceClass_s { @@ -608,7 +608,7 @@ namespace am { * this type holds all information of sources relevant to the HMI * @author christian * @version 1.0 - * @created 12-Dec-2011 8:33:22 PM + * @created 22-Dec-2011 12:55:13 AM */ struct am_SourceType_s { @@ -625,7 +625,7 @@ namespace am { * this type holds all information of sinks relevant to the HMI * @author christian * @version 1.0 - * @created 12-Dec-2011 8:33:22 PM + * @created 22-Dec-2011 12:55:13 AM */ struct am_SinkType_s { @@ -643,7 +643,7 @@ namespace am { /** * @author christian * @version 1.0 - * @created 12-Dec-2011 8:33:22 PM + * @created 22-Dec-2011 12:55:13 AM */ struct am_Handle_s { @@ -657,7 +657,7 @@ namespace am { /** * @author christian * @version 1.0 - * @created 12-Dec-2011 8:33:22 PM + * @created 22-Dec-2011 12:55:14 AM */ struct am_MainSoundProperty_s { @@ -672,7 +672,7 @@ namespace am { * this type holds all information of connections relevant to the HMI * @author christian * @version 1.0 - * @created 12-Dec-2011 8:33:23 PM + * @created 22-Dec-2011 12:55:14 AM */ struct am_MainConnectionType_s { @@ -689,7 +689,7 @@ namespace am { /** * @author christian * @version 1.0 - * @created 12-Dec-2011 8:33:23 PM + * @created 22-Dec-2011 12:55:14 AM */ struct am_MainConnection_s { @@ -705,7 +705,7 @@ namespace am { /** * @author christian * @version 1.0 - * @created 12-Dec-2011 8:33:23 PM + * @created 22-Dec-2011 12:55:15 AM */ struct am_Sink_s { @@ -729,7 +729,7 @@ namespace am { /** * @author christian * @version 1.0 - * @created 12-Dec-2011 8:33:23 PM + * @created 22-Dec-2011 12:55:15 AM */ struct am_Source_s { @@ -762,7 +762,7 @@ namespace am { /** * @author christian * @version 1.0 - * @created 12-Dec-2011 8:33:23 PM + * @created 22-Dec-2011 12:55:15 AM */ struct am_Domain_s { @@ -781,7 +781,7 @@ namespace am { /** * @author christian * @version 1.0 - * @created 12-Dec-2011 8:33:23 PM + * @created 22-Dec-2011 12:55:16 AM */ struct am_Connection_s { @@ -801,7 +801,7 @@ namespace am { * soundProperty_t in case of ED_SOURCE_PROPERTY, ED_SINK_PROPERTY * @author christian * @version 1.0 - * @created 12-Dec-2011 8:33:23 PM + * @created 22-Dec-2011 12:55:16 AM */ union am_EarlyData_u { @@ -818,7 +818,7 @@ namespace am { * sinkID in case of ED_SINK_VOLUME, ED_SINK_PROPERTY * @author christian * @version 1.0 - * @created 12-Dec-2011 8:33:24 PM + * @created 22-Dec-2011 12:55:16 AM */ union am_DataType_u { @@ -832,7 +832,7 @@ namespace am { /** * @author christian * @version 1.0 - * @created 12-Dec-2011 8:33:24 PM + * @created 22-Dec-2011 12:55:16 AM */ struct am_EarlyData_s { @@ -844,4 +844,4 @@ namespace am { }; } -#endif // !defined(EA_AFA9C9DE_BF7D_4bc2_AE65_3747DCA2D732__INCLUDED_) +#endif // !defined(EA_9BBD9DCA_BBCF_45e4_8291_45F44B455D62__INCLUDED_) diff --git a/includes/command/CommandReceiveInterface.h b/includes/command/CommandReceiveInterface.h index 13c2144..b363bd3 100644 --- a/includes/command/CommandReceiveInterface.h +++ b/includes/command/CommandReceiveInterface.h @@ -22,13 +22,16 @@ * * THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN */ -#if !defined(EA_774DDC80_E4EF_41c2_846F_FFC9FB85C2E8__INCLUDED_) -#define EA_774DDC80_E4EF_41c2_846F_FFC9FB85C2E8__INCLUDED_ +#if !defined(EA_2C18A494_5252_4d1b_A0B0_FAE151B68AEA__INCLUDED_) +#define EA_2C18A494_5252_4d1b_A0B0_FAE151B68AEA__INCLUDED_ #include #include #include "../audiomanagertypes.h" +namespace am { class DBusWrapper; +class SocketHandler; +} namespace am { @@ -36,7 +39,7 @@ 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 12-Dec-2011 8:33:24 PM + * @created 22-Dec-2011 12:55:17 AM */ class CommandReceiveInterface { @@ -173,12 +176,19 @@ namespace am { virtual am_Error_e getTimingInformation(const am_mainConnectionID_t mainConnectionID, am_timeSync_t& delay) const =0; /** * this function is used to retrieve a pointer to the dBusConnectionWrapper - * @return E_OK if pointer is valid, E_UKNOWN on error + * @return E_OK if pointer is valid, E_UKNOWN if AudioManager was compiled without DBus Support * * @param dbusConnectionWrapper This is a wrapper class that is needed to keep dbus inclusions away from the interface. The DBusWrapperClass will return the pointer to the DbusConnection call (getDBusConnection) */ virtual am_Error_e getDBusConnectionWrapper(DBusWrapper*& dbusConnectionWrapper) const =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, + * + * @param socketHandler + */ + virtual am_Error_e getSocketHandler(SocketHandler*& socketHandler) const =0; }; } -#endif // !defined(EA_774DDC80_E4EF_41c2_846F_FFC9FB85C2E8__INCLUDED_) +#endif // !defined(EA_2C18A494_5252_4d1b_A0B0_FAE151B68AEA__INCLUDED_) diff --git a/includes/command/CommandSendInterface.h b/includes/command/CommandSendInterface.h index 76f564c..0da4d76 100644 --- a/includes/command/CommandSendInterface.h +++ b/includes/command/CommandSendInterface.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_E1A66E00_EE7A_428b_A8DD_81E1B932B623__INCLUDED_) -#define EA_E1A66E00_EE7A_428b_A8DD_81E1B932B623__INCLUDED_ +#if !defined(EA_D28BAC35_CEA8_4ec8_AF26_00050F6CD9FA__INCLUDED_) +#define EA_D28BAC35_CEA8_4ec8_AF26_00050F6CD9FA__INCLUDED_ #include #include @@ -37,7 +37,7 @@ 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 12-Dec-2011 8:33:24 PM + * @created 22-Dec-2011 12:55:17 AM */ class CommandSendInterface { @@ -148,4 +148,4 @@ namespace am { }; } -#endif // !defined(EA_E1A66E00_EE7A_428b_A8DD_81E1B932B623__INCLUDED_) +#endif // !defined(EA_D28BAC35_CEA8_4ec8_AF26_00050F6CD9FA__INCLUDED_) diff --git a/includes/control/ControlReceiveInterface.h b/includes/control/ControlReceiveInterface.h index 5becc5b..bcdd451 100644 --- a/includes/control/ControlReceiveInterface.h +++ b/includes/control/ControlReceiveInterface.h @@ -22,19 +22,23 @@ * * THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN */ -#if !defined(EA_F9251584_1FDF_4c41_AF43_CDD2C4EAC0D0__INCLUDED_) -#define EA_F9251584_1FDF_4c41_AF43_CDD2C4EAC0D0__INCLUDED_ +#if !defined(EA_0244757B_93AD_4fd4_83D0_7AB70C332042__INCLUDED_) +#define EA_0244757B_93AD_4fd4_83D0_7AB70C332042__INCLUDED_ #include #include -#include "../audiomanagertypes.h" +#include "../audiomanagertypes.h" +namespace am { +class SocketHandler; +} + 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 12-Dec-2011 8:33:25 PM + * @created 22-Dec-2011 12:55:17 AM */ class ControlReceiveInterface { @@ -525,7 +529,14 @@ namespace am { * sets the routinginterface to ready. */ virtual void setRoutingReady() =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, + * + * @param socketHandler + */ + virtual am_Error_e getSocketHandler(SocketHandler*& socketHandler) =0; }; } -#endif // !defined(EA_F9251584_1FDF_4c41_AF43_CDD2C4EAC0D0__INCLUDED_) +#endif // !defined(EA_0244757B_93AD_4fd4_83D0_7AB70C332042__INCLUDED_) diff --git a/includes/control/ControlSendInterface.h b/includes/control/ControlSendInterface.h index 7e1d276..da7cbce 100644 --- a/includes/control/ControlSendInterface.h +++ b/includes/control/ControlSendInterface.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_0EFEA913_25A8_4004_B878_0459775ABFB2__INCLUDED_) -#define EA_0EFEA913_25A8_4004_B878_0459775ABFB2__INCLUDED_ +#if !defined(EA_FCDD8CB7_6516_4ee0_AF20_BF3953319E5D__INCLUDED_) +#define EA_FCDD8CB7_6516_4ee0_AF20_BF3953319E5D__INCLUDED_ #include #include @@ -36,7 +36,7 @@ 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 12-Dec-2011 8:33:25 PM + * @created 22-Dec-2011 12:55:18 AM */ class ControlSendInterface { @@ -326,4 +326,4 @@ namespace am { }; } -#endif // !defined(EA_0EFEA913_25A8_4004_B878_0459775ABFB2__INCLUDED_) +#endif // !defined(EA_FCDD8CB7_6516_4ee0_AF20_BF3953319E5D__INCLUDED_) diff --git a/dbusIncludes/CommandInterface.xml b/includes/dbus/CommandInterface.xml similarity index 100% rename from dbusIncludes/CommandInterface.xml rename to includes/dbus/CommandInterface.xml diff --git a/dbusIncludes/DBusConfiguration.h b/includes/dbus/DBusConfiguration.h similarity index 100% rename from dbusIncludes/DBusConfiguration.h rename to includes/dbus/DBusConfiguration.h diff --git a/dbusIncludes/DBusWrapper.h b/includes/dbus/DBusWrapper.h similarity index 100% rename from dbusIncludes/DBusWrapper.h rename to includes/dbus/DBusWrapper.h diff --git a/includes/projecttypes.h b/includes/projecttypes.h index 01b6212..6e00614 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_DA40303E_6D22_450f_8135_AE77F31A2394__INCLUDED_) -#define EA_DA40303E_6D22_450f_8135_AE77F31A2394__INCLUDED_ +#if !defined(EA_2CBBFF9A_7EFD_4a63_8AD7_1DC609634438__INCLUDED_) +#define EA_2CBBFF9A_7EFD_4a63_8AD7_1DC609634438__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 12-Dec-2011 8:33:24 PM + * @created 22-Dec-2011 12:55:17 AM */ 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 12-Dec-2011 8:33:24 PM + * @created 22-Dec-2011 12:55:17 AM */ enum am_AvailabilityReason_e { @@ -63,7 +63,7 @@ namespace am { * product specific identifier of property * @author christian * @version 1.0 - * @created 12-Dec-2011 8:33:24 PM + * @created 22-Dec-2011 12:55:17 AM */ 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 12-Dec-2011 8:33:24 PM + * @created 22-Dec-2011 12:55:17 AM */ 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 12-Dec-2011 8:33:24 PM + * @created 22-Dec-2011 12:55:17 AM */ 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 12-Dec-2011 8:33:24 PM + * @created 22-Dec-2011 12:55:17 AM */ enum am_MainSoundPropertyType_e { @@ -138,7 +138,7 @@ namespace am { * describes the different system properties. Project specific * @author christian * @version 1.0 - * @created 12-Dec-2011 8:33:24 PM + * @created 22-Dec-2011 12:55:17 AM */ enum am_SystemPropertyType_e { @@ -147,4 +147,4 @@ namespace am { SYP_MIN = SYP_TEST }; } -#endif // !defined(EA_DA40303E_6D22_450f_8135_AE77F31A2394__INCLUDED_) +#endif // !defined(EA_2CBBFF9A_7EFD_4a63_8AD7_1DC609634438__INCLUDED_) diff --git a/includes/routing/RoutingReceiveInterface.h b/includes/routing/RoutingReceiveInterface.h index c2df390..33df05b 100644 --- a/includes/routing/RoutingReceiveInterface.h +++ b/includes/routing/RoutingReceiveInterface.h @@ -22,20 +22,24 @@ * * THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN */ -#if !defined(EA_608714FA_D916_4497_B948_2D305C5741EB__INCLUDED_) -#define EA_608714FA_D916_4497_B948_2D305C5741EB__INCLUDED_ +#if !defined(EA_4264FCC6_2875_4a34_B7B3_1157DD551AF6__INCLUDED_) +#define EA_4264FCC6_2875_4a34_B7B3_1157DD551AF6__INCLUDED_ #include #include #include "../audiomanagertypes.h" -class DBusWrapper; +namespace am { +class DBusWrapper; +class SocketHandler; +} + namespace am { /** * Routing Receive sendInterface description. This class implements everything from RoutingAdapter -> Audiomanager * @author christian * @version 1.0 - * @created 12-Dec-2011 8:33:26 PM + * @created 22-Dec-2011 12:55:18 AM */ class RoutingReceiveInterface { @@ -219,21 +223,21 @@ namespace am { */ virtual am_Error_e deregisterCrossfader(const am_crossfaderID_t crossfaderID) =0; /** - * this function peeks a sourceClassID. It is used by the RoutingPlugins to determine the sourceClassIDs of a sourceClass. + * this function peeks a sourceclassID. It is used by the RoutingPlugins to determine the SinkClassIDs of a sinkClass. * @return E_OK on succes, E_DATABASE_ERROR on error * * @param name * @param sourceClassID */ - virtual am_Error_e peekSinkClassID(const std::string& name, am_sourceClass_t& sourceClassID) =0; + virtual am_Error_e peekSourceClassID(const std::string name, const am_sourceClass_t& sourceClassID) =0; /** - * this function peeks a sink classID. It is used by the RoutingPlugins to determine the SinkClassIDs of a sinkClass. + * this function peeks a sourceclassID. It is used by the RoutingPlugins to determine the SinkClassIDs of a sinkClass. * @return E_OK on succes, E_DATABASE_ERROR on error * * @param name * @param sinkClassID */ - virtual am_Error_e peekSourceClassID(const std::string& name, am_sinkClass_t& sinkClassID) =0; + virtual am_Error_e peekSinkClassID(const std::string name, const am_sinkClass_t& sinkClassID) =0; /** * is called when a low level interrupt changes it status. * @@ -284,13 +288,20 @@ namespace am { */ virtual am_Error_e sendChangedData(const std::vector& earlyData) =0; /** - * this function is used to retrieve the pointer to the dBusConnectionWrapper - * @return E_OK on success, E_UNKNOWN on error + * this function is used to retrieve a pointer to the dBusConnectionWrapper + * @return E_OK if pointer is valid, E_UKNOWN if AudioManager was compiled without DBus Support * * @param dbusConnectionWrapper This is a wrapper class that is needed to keep dbus inclusions away from the interface. The DBusWrapperClass will return the pointer to the DbusConnection call (getDBusConnection) */ - virtual am_Error_e getDBusConnectionWrapper(DBusWrapper* dbusConnectionWrapper) const =0; + virtual am_Error_e getDBusConnectionWrapper(DBusWrapper*& dbusConnectionWrapper) const =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, + * + * @param socketHandler + */ + virtual am_Error_e getSocketHandler(SocketHandler*& socketHandler) const =0; }; } -#endif // !defined(EA_608714FA_D916_4497_B948_2D305C5741EB__INCLUDED_) +#endif // !defined(EA_4264FCC6_2875_4a34_B7B3_1157DD551AF6__INCLUDED_) diff --git a/includes/routing/RoutingSendInterface.h b/includes/routing/RoutingSendInterface.h index b042968..06d4994 100644 --- a/includes/routing/RoutingSendInterface.h +++ b/includes/routing/RoutingSendInterface.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_B8D31066_968E_4ef2_A85E_A29A742A5206__INCLUDED_) -#define EA_B8D31066_968E_4ef2_A85E_A29A742A5206__INCLUDED_ +#if !defined(EA_BEEEF7D0_77D1_4bb1_8A9D_5E6E127272EE__INCLUDED_) +#define EA_BEEEF7D0_77D1_4bb1_8A9D_5E6E127272EE__INCLUDED_ #include #include @@ -37,7 +37,7 @@ namespace am { * This class implements everything from Audiomanager -> RoutingAdapter * @author christian * @version 1.0 - * @created 12-Dec-2011 8:33:26 PM + * @created 22-Dec-2011 12:55:19 AM */ class RoutingSendInterface { @@ -162,4 +162,4 @@ namespace am { }; } -#endif // !defined(EA_B8D31066_968E_4ef2_A85E_A29A742A5206__INCLUDED_) +#endif // !defined(EA_BEEEF7D0_77D1_4bb1_8A9D_5E6E127272EE__INCLUDED_) -- 2.7.4