diff options
author | christian mueller <christian.ei.mueller@bmw.de> | 2012-02-01 10:50:15 +0100 |
---|---|---|
committer | christian mueller <christian.ei.mueller@bmw.de> | 2012-02-01 14:01:29 +0100 |
commit | 9f4c15a8e89d798077ca3edf7f786dbc740aa176 (patch) | |
tree | 878af38925ee08720418790d85b9938877aa452e /includes/routing/RoutingReceiveInterface.h | |
parent | 52a769615e476860f3e4c0196fdf7e5159a7a7c1 (diff) | |
download | audiomanager-9f4c15a8e89d798077ca3edf7f786dbc740aa176.tar.gz |
* implemented peeksinkclassIDs and peeksourceclassIDs
* changed interface of both from const to non-const
* corrected include headers to c++ style, eg. <cassert>
* corrected sendChangedData return type to void
* implemented tests for sinkclass and sourceclass peeking
* fixed bug in sockethandler (FD could not be removed) thanks to Frank
Diffstat (limited to 'includes/routing/RoutingReceiveInterface.h')
-rw-r--r-- | includes/routing/RoutingReceiveInterface.h | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/includes/routing/RoutingReceiveInterface.h b/includes/routing/RoutingReceiveInterface.h index e610f92..c2438a9 100644 --- a/includes/routing/RoutingReceiveInterface.h +++ b/includes/routing/RoutingReceiveInterface.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_6B5234F4_E3F3_46f3_9B2A_892FD2A0236E__INCLUDED_)
-#define EA_6B5234F4_E3F3_46f3_9B2A_892FD2A0236E__INCLUDED_
+#if !defined(EA_21C9D5F3_73BF_4121_9A14_1D76799A05A0__INCLUDED_)
+#define EA_21C9D5F3_73BF_4121_9A14_1D76799A05A0__INCLUDED_
#include <vector>
#include <string>
@@ -41,7 +41,7 @@ namespace am { * Routing Receive sendInterface description. This class implements everything from RoutingAdapter -> Audiomanager * @author christian * @version 1.0 - * @created 30-Jan-2012 6:29:29 PM + * @created 01-Feb-2012 9:42:02 AM */ class RoutingReceiveInterface { @@ -248,20 +248,20 @@ 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 SinkClassIDs of a sinkClass.
- * @return E_OK on succes, E_DATABASE_ERROR on error + * @return E_OK on succes, E_DATABASE_ERROR on error, E_NON_EXISTENT if no sourceclass with name is registered * * @param name * @param sourceClassID */ - virtual am_Error_e peekSourceClassID(const std::string& name, const am_sourceClass_t& sourceClassID) =0; + virtual am_Error_e peekSourceClassID(const std::string& name, am_sourceClass_t& sourceClassID) =0; /** * 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 + * @return E_OK on succes, E_DATABASE_ERROR on error, E_NON_EXISTENT if no sourceclass with name is registered * * @param name * @param sinkClassID */ - virtual am_Error_e peekSinkClassID(const std::string& name, const am_sinkClass_t& sinkClassID) =0; + virtual am_Error_e peekSinkClassID(const std::string& name, am_sinkClass_t& sinkClassID) =0; /** * is called when a low level interrupt changes it status. * @@ -305,12 +305,11 @@ namespace am { */ virtual void hookTimingInformationChanged(const am_connectionID_t connectionID, const am_timeSync_t delay) =0; /** - * this function is used to send out all data that has been changed in an early state.
- * @return E_OK on success, E_UNKNOWN on error + * this function is used to send out all data that has been changed in an early state. * * @param earlyData */ - virtual am_Error_e sendChangedData(const std::vector<am_EarlyData_s>& earlyData) =0; + virtual void sendChangedData(const std::vector<am_EarlyData_s>& earlyData) =0; /** * 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 @@ -332,4 +331,4 @@ namespace am { }; } -#endif // !defined(EA_6B5234F4_E3F3_46f3_9B2A_892FD2A0236E__INCLUDED_) +#endif // !defined(EA_21C9D5F3_73BF_4121_9A14_1D76799A05A0__INCLUDED_) |