* 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 

1 files changed, 23 insertions, 12 deletions

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 <vector>

 #include <string>

 #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<am_EarlyData_s>& 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_)