1 files changed, 44 insertions, 38 deletions
diff --git a/includes/control/ControlReceiveInterface.h b/includes/control/ControlReceiveInterface.h
index a3ec949..35bf977 100644
--- a/includes/control/ControlReceiveInterface.h
+++ b/includes/control/ControlReceiveInterface.h
@@ -1,29 +1,24 @@
-/**
-* Copyright (C) 2011, BMW AG
-*
-* GeniviAudioMananger
-*
-* \file  
-*
-* \date 20-Oct-2011 3:42:04 PM
-* \author Christian Mueller (christian.ei.mueller@bmw.de)
-*
-* \section License
-* GNU Lesser General Public License, version 2.1, with special exception (GENIVI clause)
-* 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.
-* You should have received a copy of the GNU Lesser General Public License, version 2.1, along with this program; if not, see <http://www.gnu.org/licenses/lgpl-2.1.html>.
-* Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may also be applicable to programs even in cases in which the program is not a library in the technical sense.
-* Linking AudioManager statically or dynamically with other modules is making a combined work based on AudioManager. You may license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to license your linked modules under the GNU Lesser General Public License, version 2.1, you may use the program under the following exception.
-* As a special exception, the copyright holders of AudioManager give you permission to combine AudioManager with software programs or libraries that are released under any license unless such a combination is not permitted by the license of such a software program or library. You may copy and distribute such a system following the terms of the GNU Lesser General Public License, version 2.1, including this special exception, for AudioManager and the licenses of the other code concerned.
-* Note that people who make modified versions of AudioManager are not obligated to grant this special exception for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, version 2.1, gives permission to release a modified version without this exception; this exception also makes it possible to release a modified version which carries forward this exception.
-*
-* THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN
-*/
-#if !defined(EA_E6BEDBFE_083F_4174_8B46_FDDAEE627EB3__INCLUDED_)
-#define EA_E6BEDBFE_083F_4174_8B46_FDDAEE627EB3__INCLUDED_
+/** Copyright (c) 2012 GENIVI Alliance
+ *  Copyright (c) 2012 BMW
+ *
+ *  @author Christian Mueller, BMW
+ *
+ *  @copyright
+ *  {
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction,
+ *  including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
+ *  subject to the following conditions:
+ *  The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ *  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+ *  THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *  }
+ *
+ * 
+ * THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN
+ */
+#if !defined(EA_4782C934_9728_44b7_8F9A_D8FB838CF1A7__INCLUDED_)
+#define EA_4782C934_9728_44b7_8F9A_D8FB838CF1A7__INCLUDED_
 
 #include <vector>
 #include <string>
@@ -33,16 +28,17 @@ class SocketHandler;
 }
 
 
-#define ControlReceiveVersion 1.0
+#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.
-	 * 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.
+	 * There are two rules that have to be kept in mind when implementing against this interface:\n<b>
+	 * 1. CALLS TO THIS INTERFACE ARE NOT THREAD SAFE !!!! \n
+	 * 2. YOU MAY NOT THE CALLING INTERFACE DURING AN SYNCHRONOUS OR ASYNCHRONOUS CALL THAT EXPECTS A RETURN VALUE.</b>\n
+	 * 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.\n
+	 * For more information, please check CAmSerializer
 	 * @author Christian Mueller
-	 * @created 21-Feb-2012 4:58:36 PM
+	 * @created 27-Feb-2012 6:57:32 PM
 	 */
 	class ControlReceiveInterface
 	{
@@ -576,22 +572,30 @@ namespace am {
 		 */
 		virtual am_Error_e getListSystemProperties(std::vector<am_SystemProperty_s>& listSystemProperties) const =0;
 		/**
-		 * sets the command interface to ready 
+		 * sets the command interface to ready. Will send setCommandReady to each of the plugins. The corresponding answer is confirmCommandReady. 
 		 */
 		virtual void setCommandReady() =0;
 		/**
-		 * sets the command interface into the rundown state
+		 * sets the command interface into the rundown state. Will send setCommandRundown to each of the plugins. The corresponding answer is confirmCommandRundown. 
 		 */
 		virtual void setCommandRundown() =0;
 		/**
-		 * sets the routinginterface to  ready.
+		 * sets the routinginterface to  ready. Will send the command  setRoutingReady to each of the plugins. The related answer is confirmRoutingReady.
 		 */
 		virtual void setRoutingReady() =0;
 		/**
-		 * sets the routinginterface to the rundown state
+		 * sets the routinginterface to the rundown state. Will send the command  setRoutingRundown to each of the plugins. The related answer is confirmRoutingRundown.
 		 */
 		virtual void setRoutingRundown() =0;
 		/**
+		 * acknowledges the setControllerReady call.
+		 */
+		virtual void confirmControllerReady() =0;
+		/**
+		 * acknowledges the setControllerRundown call.
+		 */
+		virtual void confirmControllerRundown() =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,
 		 * 
@@ -600,9 +604,11 @@ namespace am {
 		virtual am_Error_e getSocketHandler(SocketHandler*& socketHandler) =0;
 		/**
 		 * This function returns the version of the interface
+		 * 
+		 * @param version
 		 */
-		virtual uint16_t getInterfaceVersion() const =0;
+		virtual void getInterfaceVersion(std::string& version) const =0;
 
 	};
 }
-#endif // !defined(EA_E6BEDBFE_083F_4174_8B46_FDDAEE627EB3__INCLUDED_)
+#endif // !defined(EA_4782C934_9728_44b7_8F9A_D8FB838CF1A7__INCLUDED_)