From 958a34ae8c5c6f25ba73640b9e7f9998b23fd62a Mon Sep 17 00:00:00 2001 From: Christian Linke Date: Thu, 12 Sep 2013 10:59:47 +0200 Subject: * added some documentation, removed sample project since it seems to addle users. Now the fidls are the matching final the EA version. Signed-off-by: Christian Linke --- .../fidl/CommandInterface.fidl | 7 +++-- .../fidl/PluginCommandInterfaceCAPI_dbus.conf | 4 +-- .../include/CAmCommandSenderService.h | 2 +- .../src-gen/org/genivi/am.cpp | 24 ++++++++++++++-- PluginCommandInterfaceCAPI/src-gen/org/genivi/am.h | 24 ++++++++++++++-- .../src-gen/org/genivi/am/CommandControl.h | 24 ++++++++++++++-- .../org/genivi/am/CommandControlDBusProxy.cpp | 32 +++++++++++++++++----- .../org/genivi/am/CommandControlDBusProxy.h | 26 +++++++++++++++--- .../genivi/am/CommandControlDBusStubAdapter.cpp | 30 ++++++++++++++++---- .../org/genivi/am/CommandControlDBusStubAdapter.h | 24 ++++++++++++++-- .../src-gen/org/genivi/am/CommandControlProxy.h | 30 ++++++++++++++++---- .../org/genivi/am/CommandControlProxyBase.h | 28 +++++++++++++++---- .../src-gen/org/genivi/am/CommandControlStub.h | 26 +++++++++++++++--- .../org/genivi/am/CommandControlStubDefault.cpp | 26 +++++++++++++++--- .../org/genivi/am/CommandControlStubDefault.h | 26 +++++++++++++++--- .../src/CAmCommandSenderService.cpp | 2 +- .../test/CAmCommandSenderCAPITest.cpp | 2 +- 17 files changed, 277 insertions(+), 60 deletions(-) (limited to 'PluginCommandInterfaceCAPI') diff --git a/PluginCommandInterfaceCAPI/fidl/CommandInterface.fidl b/PluginCommandInterfaceCAPI/fidl/CommandInterface.fidl index 0d752d6..1fc0d5f 100644 --- a/PluginCommandInterfaceCAPI/fidl/CommandInterface.fidl +++ b/PluginCommandInterfaceCAPI/fidl/CommandInterface.fidl @@ -101,7 +101,7 @@ interface CommandControl { **> method setMainSinkSoundProperty { in { - am_sinkID_t sinkID + am_sinkID_t sinkID am_MainSoundProperty_s soundProperty } out { @@ -115,7 +115,7 @@ interface CommandControl { **> method setMainSourceSoundProperty { in { - am_sourceID_t sourceID + am_sourceID_t sourceID am_MainSoundProperty_s soundProperty } out { @@ -146,12 +146,12 @@ interface CommandControl { **> method getListMainConnections { out { - am_Error_e ^error <** @description : returns a list of all connections **> am_MainConnection_L listConnections + am_Error_e ^error } } @@ -602,4 +602,5 @@ interface CommandControl { am_NotificationConfiguration_s mainNotificationConfiguration } } + } \ No newline at end of file diff --git a/PluginCommandInterfaceCAPI/fidl/PluginCommandInterfaceCAPI_dbus.conf b/PluginCommandInterfaceCAPI/fidl/PluginCommandInterfaceCAPI_dbus.conf index b3ae199..35c5558 100644 --- a/PluginCommandInterfaceCAPI/fidl/PluginCommandInterfaceCAPI_dbus.conf +++ b/PluginCommandInterfaceCAPI/fidl/PluginCommandInterfaceCAPI_dbus.conf @@ -4,5 +4,5 @@ ################################################################################################################## [local:org.genivi.audiomanger.commandinterface:org.genivi.audiomanger] dbus_connection=org.genivi.audiomanager -dbus_object=/org/genivi/audiomanager/commandinterface -dbus_interface=org.genivi.audiomanager.commandinterface \ No newline at end of file +dbus_object=/org/genivi/audiomanager/CommandControl +dbus_interface=org.genivi.audiomanager.CommandControl \ No newline at end of file diff --git a/PluginCommandInterfaceCAPI/include/CAmCommandSenderService.h b/PluginCommandInterfaceCAPI/include/CAmCommandSenderService.h index 0fbf499..654436f 100644 --- a/PluginCommandInterfaceCAPI/include/CAmCommandSenderService.h +++ b/PluginCommandInterfaceCAPI/include/CAmCommandSenderService.h @@ -49,7 +49,7 @@ public: virtual void setSystemProperty(org::genivi::am::am_SystemProperty_s soundProperty, org::genivi::am::am_Error_e& result); - virtual void getListMainConnections(org::genivi::am::am_Error_e& result, org::genivi::am::am_MainConnection_L& listConnections); + virtual void getListMainConnections(org::genivi::am::am_MainConnection_L& listConnections,org::genivi::am::am_Error_e& result); virtual void getListMainSinks(org::genivi::am::am_SinkType_L& listMainSinks, org::genivi::am::am_Error_e& result); diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am.cpp b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am.cpp index 01169e7..ab69bbb 100644 --- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am.cpp +++ b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am.cpp @@ -1,9 +1,27 @@ /* * This file was generated by the CommonAPI Generators. * - * Copyright (C) 2013, BMW AG - * - * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013 +* This file was generated by the CommonAPI Generators. +* +* This file was generated by the CommonAPI Generators. +* +* Copyright (C) 2012, BMW AG +* +* This file is part of GENIVI Project AudioManager. +* +* Contributions are licensed to the GENIVI Alliance under one or more +* Contribution License Agreements. +* +* \copyright +* This Source Code Form is subject to the terms of the +* Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with +* this file, You can obtain one at http://mozilla.org/MPL/2.0/. +* +* +* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013 +* \author Christian Linke christian.linke@bmw.de BMW 2013 +* +* For further information see http://www.genivi.org/. */ #include "am.h" diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am.h b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am.h index 8e9b4be..4d94244 100644 --- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am.h +++ b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am.h @@ -1,9 +1,27 @@ /* * This file was generated by the CommonAPI Generators. * - * Copyright (C) 2013, BMW AG - * - * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013 +* This file was generated by the CommonAPI Generators. +* +* This file was generated by the CommonAPI Generators. +* +* Copyright (C) 2012, BMW AG +* +* This file is part of GENIVI Project AudioManager. +* +* Contributions are licensed to the GENIVI Alliance under one or more +* Contribution License Agreements. +* +* \copyright +* This Source Code Form is subject to the terms of the +* Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with +* this file, You can obtain one at http://mozilla.org/MPL/2.0/. +* +* +* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013 +* \author Christian Linke christian.linke@bmw.de BMW 2013 +* +* For further information see http://www.genivi.org/. */ #ifndef ORG_GENIVI_am_H_ #define ORG_GENIVI_am_H_ diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControl.h b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControl.h index 88f5ca2..f631c92 100644 --- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControl.h +++ b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControl.h @@ -1,9 +1,27 @@ /* * This file was generated by the CommonAPI Generators. * - * Copyright (C) 2013, BMW AG - * - * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013 +* This file was generated by the CommonAPI Generators. +* +* This file was generated by the CommonAPI Generators. +* +* Copyright (C) 2012, BMW AG +* +* This file is part of GENIVI Project AudioManager. +* +* Contributions are licensed to the GENIVI Alliance under one or more +* Contribution License Agreements. +* +* \copyright +* This Source Code Form is subject to the terms of the +* Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with +* this file, You can obtain one at http://mozilla.org/MPL/2.0/. +* +* +* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013 +* \author Christian Linke christian.linke@bmw.de BMW 2013 +* +* For further information see http://www.genivi.org/. */ #ifndef ORG_GENIVI_AM_Command_Control_H_ #define ORG_GENIVI_AM_Command_Control_H_ diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusProxy.cpp b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusProxy.cpp index 4901145..cf6f32b 100644 --- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusProxy.cpp +++ b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusProxy.cpp @@ -1,9 +1,27 @@ /* * This file was generated by the CommonAPI Generators. * - * Copyright (C) 2013, BMW AG - * - * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013 +* This file was generated by the CommonAPI Generators. +* +* This file was generated by the CommonAPI Generators. +* +* Copyright (C) 2012, BMW AG +* +* This file is part of GENIVI Project AudioManager. +* +* Contributions are licensed to the GENIVI Alliance under one or more +* Contribution License Agreements. +* +* \copyright +* This Source Code Form is subject to the terms of the +* Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with +* this file, You can obtain one at http://mozilla.org/MPL/2.0/. +* +* +* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013 +* \author Christian Linke christian.linke@bmw.de BMW 2013 +* +* For further information see http://www.genivi.org/. */ #include "CommandControlDBusProxy.h" @@ -281,18 +299,18 @@ std::future CommandControlDBusProxy::setSystemPropertyAsy property, std::move(callback)); } -void CommandControlDBusProxy::getListMainConnections(CommonAPI::CallStatus& callStatus, am_Error_e& error, am_MainConnection_L& listConnections) { +void CommandControlDBusProxy::getListMainConnections(CommonAPI::CallStatus& callStatus, am_MainConnection_L& listConnections, am_Error_e& error) { CommonAPI::DBus::DBusProxyHelper, - CommonAPI::DBus::DBusSerializableArguments >::callMethodWithReply( + CommonAPI::DBus::DBusSerializableArguments >::callMethodWithReply( *this, "getListMainConnections", "", callStatus - , error, listConnections); + , listConnections, error); } std::future CommandControlDBusProxy::getListMainConnectionsAsync(GetListMainConnectionsAsyncCallback callback) { return CommonAPI::DBus::DBusProxyHelper, - CommonAPI::DBus::DBusSerializableArguments >::callMethodAsync( + CommonAPI::DBus::DBusSerializableArguments >::callMethodAsync( *this, "getListMainConnections", "", diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusProxy.h b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusProxy.h index 0c6e470..3f146b7 100644 --- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusProxy.h +++ b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusProxy.h @@ -1,9 +1,27 @@ /* * This file was generated by the CommonAPI Generators. * - * Copyright (C) 2013, BMW AG - * - * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013 +* This file was generated by the CommonAPI Generators. +* +* This file was generated by the CommonAPI Generators. +* +* Copyright (C) 2012, BMW AG +* +* This file is part of GENIVI Project AudioManager. +* +* Contributions are licensed to the GENIVI Alliance under one or more +* Contribution License Agreements. +* +* \copyright +* This Source Code Form is subject to the terms of the +* Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with +* this file, You can obtain one at http://mozilla.org/MPL/2.0/. +* +* +* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013 +* \author Christian Linke christian.linke@bmw.de BMW 2013 +* +* For further information see http://www.genivi.org/. */ #ifndef ORG_GENIVI_AM_Command_Control_DBUS_PROXY_H_ #define ORG_GENIVI_AM_Command_Control_DBUS_PROXY_H_ @@ -85,7 +103,7 @@ class CommandControlDBusProxy: virtual public CommandControlProxyBase, virtual p virtual void setSystemProperty(const am_SystemProperty_s& property, CommonAPI::CallStatus& callStatus, am_Error_e& error); virtual std::future setSystemPropertyAsync(const am_SystemProperty_s& property, SetSystemPropertyAsyncCallback callback); - virtual void getListMainConnections(CommonAPI::CallStatus& callStatus, am_Error_e& error, am_MainConnection_L& listConnections); + virtual void getListMainConnections(CommonAPI::CallStatus& callStatus, am_MainConnection_L& listConnections, am_Error_e& error); virtual std::future getListMainConnectionsAsync(GetListMainConnectionsAsyncCallback callback); virtual void getListMainSinks(CommonAPI::CallStatus& callStatus, am_SinkType_L& listMainSinks, am_Error_e& error); diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusStubAdapter.cpp b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusStubAdapter.cpp index 89d06a8..4715cdb 100644 --- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusStubAdapter.cpp +++ b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusStubAdapter.cpp @@ -1,9 +1,27 @@ /* * This file was generated by the CommonAPI Generators. * - * Copyright (C) 2013, BMW AG - * - * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013 +* This file was generated by the CommonAPI Generators. +* +* This file was generated by the CommonAPI Generators. +* +* Copyright (C) 2012, BMW AG +* +* This file is part of GENIVI Project AudioManager. +* +* Contributions are licensed to the GENIVI Alliance under one or more +* Contribution License Agreements. +* +* \copyright +* This Source Code Form is subject to the terms of the +* Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with +* this file, You can obtain one at http://mozilla.org/MPL/2.0/. +* +* +* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013 +* \author Christian Linke christian.linke@bmw.de BMW 2013 +* +* For further information see http://www.genivi.org/. */ #include "CommandControlDBusStubAdapter.h" #include @@ -162,8 +180,8 @@ const char* CommandControlDBusStubAdapter::getMethodsDBusIntrospectionXmlData() "\n" "\n" "\n" - "\n" "\n" + "\n" "\n" "\n" "\n" @@ -268,8 +286,8 @@ static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< CommandControlStub, std::tuple<>, - std::tuple - > getListMainConnectionsStubDispatcher(&CommandControlStub::getListMainConnections, "ia(qqqni)"); + std::tuple + > getListMainConnectionsStubDispatcher(&CommandControlStub::getListMainConnections, "a(qqqni)i"); static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< CommandControlStub, std::tuple<>, diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusStubAdapter.h b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusStubAdapter.h index 0435d14..d51fdd7 100644 --- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusStubAdapter.h +++ b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusStubAdapter.h @@ -1,9 +1,27 @@ /* * This file was generated by the CommonAPI Generators. * - * Copyright (C) 2013, BMW AG - * - * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013 +* This file was generated by the CommonAPI Generators. +* +* This file was generated by the CommonAPI Generators. +* +* Copyright (C) 2012, BMW AG +* +* This file is part of GENIVI Project AudioManager. +* +* Contributions are licensed to the GENIVI Alliance under one or more +* Contribution License Agreements. +* +* \copyright +* This Source Code Form is subject to the terms of the +* Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with +* this file, You can obtain one at http://mozilla.org/MPL/2.0/. +* +* +* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013 +* \author Christian Linke christian.linke@bmw.de BMW 2013 +* +* For further information see http://www.genivi.org/. */ #ifndef ORG_GENIVI_AM_Command_Control_DBUS_STUB_ADAPTER_H_ #define ORG_GENIVI_AM_Command_Control_DBUS_STUB_ADAPTER_H_ diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlProxy.h b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlProxy.h index 3f6b3fc..8bcb7fe 100644 --- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlProxy.h +++ b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlProxy.h @@ -1,9 +1,27 @@ /* * This file was generated by the CommonAPI Generators. * - * Copyright (C) 2013, BMW AG - * - * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013 +* This file was generated by the CommonAPI Generators. +* +* This file was generated by the CommonAPI Generators. +* +* Copyright (C) 2012, BMW AG +* +* This file is part of GENIVI Project AudioManager. +* +* Contributions are licensed to the GENIVI Alliance under one or more +* Contribution License Agreements. +* +* \copyright +* This Source Code Form is subject to the terms of the +* Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with +* this file, You can obtain one at http://mozilla.org/MPL/2.0/. +* +* +* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013 +* \author Christian Linke christian.linke@bmw.de BMW 2013 +* +* For further information see http://www.genivi.org/. */ #ifndef ORG_GENIVI_AM_Command_Control_PROXY_H_ #define ORG_GENIVI_AM_Command_Control_PROXY_H_ @@ -336,7 +354,7 @@ class CommandControlProxy: virtual public CommandControl, virtual public Command * will be set. * Synchronous calls are not supported (will block indefinitely) when mainloop integration is used. */ - virtual void getListMainConnections(CommonAPI::CallStatus& callStatus, am_Error_e& error, am_MainConnection_L& listConnections); + virtual void getListMainConnections(CommonAPI::CallStatus& callStatus, am_MainConnection_L& listConnections, am_Error_e& error); /** * Calls getListMainConnections with asynchronous semantics. * @@ -746,8 +764,8 @@ std::future CommandControlProxy<_AttributeExtensions...>: } template -void CommandControlProxy<_AttributeExtensions...>::getListMainConnections(CommonAPI::CallStatus& callStatus, am_Error_e& error, am_MainConnection_L& listConnections) { - delegate_->getListMainConnections(callStatus, error, listConnections); +void CommandControlProxy<_AttributeExtensions...>::getListMainConnections(CommonAPI::CallStatus& callStatus, am_MainConnection_L& listConnections, am_Error_e& error) { + delegate_->getListMainConnections(callStatus, listConnections, error); } template diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlProxyBase.h b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlProxyBase.h index eaf1fc8..588e2a7 100644 --- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlProxyBase.h +++ b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlProxyBase.h @@ -1,9 +1,27 @@ /* * This file was generated by the CommonAPI Generators. * - * Copyright (C) 2013, BMW AG - * - * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013 + * This file was generated by the CommonAPI Generators. + * + * This file was generated by the CommonAPI Generators. + * + * Copyright (C) 2012, BMW AG + * + * This file is part of GENIVI Project AudioManager. + * + * Contributions are licensed to the GENIVI Alliance under one or more + * Contribution License Agreements. + * + * \copyright + * This Source Code Form is subject to the terms of the + * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with + * this file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * + * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013 + * \author Christian Linke christian.linke@bmw.de BMW 2013 + * + * For further information see http://www.genivi.org/. */ #ifndef ORG_GENIVI_AM_Command_Control_PROXY_BASE_H_ #define ORG_GENIVI_AM_Command_Control_PROXY_BASE_H_ @@ -66,7 +84,7 @@ typedef std::function SetMainSinkSoundPropertyAsyncCallback; typedef std::function SetMainSourceSoundPropertyAsyncCallback; typedef std::function SetSystemPropertyAsyncCallback; - typedef std::function GetListMainConnectionsAsyncCallback; + typedef std::function GetListMainConnectionsAsyncCallback; typedef std::function GetListMainSinksAsyncCallback; typedef std::function GetListMainSourcesAsyncCallback; typedef std::function GetListMainSinkSoundPropertiesAsyncCallback; @@ -130,7 +148,7 @@ virtual void setSystemProperty(const am_SystemProperty_s& property, CommonAPI::CallStatus& callStatus, am_Error_e& error) = 0; virtual std::future setSystemPropertyAsync(const am_SystemProperty_s& property, SetSystemPropertyAsyncCallback callback) = 0; - virtual void getListMainConnections(CommonAPI::CallStatus& callStatus, am_Error_e& error, am_MainConnection_L& listConnections) = 0; + virtual void getListMainConnections(CommonAPI::CallStatus& callStatus, am_MainConnection_L& listConnections, am_Error_e& error) = 0; virtual std::future getListMainConnectionsAsync(GetListMainConnectionsAsyncCallback callback) = 0; virtual void getListMainSinks(CommonAPI::CallStatus& callStatus, am_SinkType_L& listMainSinks, am_Error_e& error) = 0; diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStub.h b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStub.h index 5bca231..838a7e6 100644 --- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStub.h +++ b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStub.h @@ -1,9 +1,27 @@ /* * This file was generated by the CommonAPI Generators. * - * Copyright (C) 2013, BMW AG - * - * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013 +* This file was generated by the CommonAPI Generators. +* +* This file was generated by the CommonAPI Generators. +* +* Copyright (C) 2012, BMW AG +* +* This file is part of GENIVI Project AudioManager. +* +* Contributions are licensed to the GENIVI Alliance under one or more +* Contribution License Agreements. +* +* \copyright +* This Source Code Form is subject to the terms of the +* Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with +* this file, You can obtain one at http://mozilla.org/MPL/2.0/. +* +* +* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013 +* \author Christian Linke christian.linke@bmw.de BMW 2013 +* +* For further information see http://www.genivi.org/. */ #ifndef ORG_GENIVI_AM_Command_Control_STUB_H_ #define ORG_GENIVI_AM_Command_Control_STUB_H_ @@ -205,7 +223,7 @@ class CommandControlStub : public CommonAPI::Stub @@ -53,7 +71,7 @@ void CommandControlStubDefault::setSystemProperty(am_SystemProperty_s property, // No operation in default } -void CommandControlStubDefault::getListMainConnections(am_Error_e& error, am_MainConnection_L& listConnections) { +void CommandControlStubDefault::getListMainConnections(am_MainConnection_L& listConnections, am_Error_e& error) { // No operation in default } diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStubDefault.h b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStubDefault.h index e718d76..5b30746 100644 --- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStubDefault.h +++ b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStubDefault.h @@ -1,9 +1,27 @@ /* * This file was generated by the CommonAPI Generators. * - * Copyright (C) 2013, BMW AG - * - * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013 +* This file was generated by the CommonAPI Generators. +* +* This file was generated by the CommonAPI Generators. +* +* Copyright (C) 2012, BMW AG +* +* This file is part of GENIVI Project AudioManager. +* +* Contributions are licensed to the GENIVI Alliance under one or more +* Contribution License Agreements. +* +* \copyright +* This Source Code Form is subject to the terms of the +* Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with +* this file, You can obtain one at http://mozilla.org/MPL/2.0/. +* +* +* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013 +* \author Christian Linke christian.linke@bmw.de BMW 2013 +* +* For further information see http://www.genivi.org/. */ #ifndef ORG_GENIVI_AM_Command_Control_STUB_DEFAULT_H_ #define ORG_GENIVI_AM_Command_Control_STUB_DEFAULT_H_ @@ -47,7 +65,7 @@ class CommandControlStubDefault : public CommandControlStub { virtual void setSystemProperty(am_SystemProperty_s property, am_Error_e& error); - virtual void getListMainConnections(am_Error_e& error, am_MainConnection_L& listConnections); + virtual void getListMainConnections(am_MainConnection_L& listConnections, am_Error_e& error); virtual void getListMainSinks(am_SinkType_L& listMainSinks, am_Error_e& error); diff --git a/PluginCommandInterfaceCAPI/src/CAmCommandSenderService.cpp b/PluginCommandInterfaceCAPI/src/CAmCommandSenderService.cpp index e9f7f9a..552ff9a 100644 --- a/PluginCommandInterfaceCAPI/src/CAmCommandSenderService.cpp +++ b/PluginCommandInterfaceCAPI/src/CAmCommandSenderService.cpp @@ -81,7 +81,7 @@ void CAmCommandSenderService::setSystemProperty(org::genivi::am::am_SystemProper result = CAmConvert2CAPIType(mpIAmCommandReceive->setSystemProperty(property)); } -void CAmCommandSenderService::getListMainConnections(org::genivi::am::am_Error_e& result, org::genivi::am::am_MainConnection_L& listConnections) { +void CAmCommandSenderService::getListMainConnections(org::genivi::am::am_MainConnection_L& listConnections,org::genivi::am::am_Error_e& result) { assert(mpIAmCommandReceive); std::vector list; result = CAmConvert2CAPIType(mpIAmCommandReceive->getListMainConnections(list)); diff --git a/PluginCommandInterfaceCAPI/test/CAmCommandSenderCAPITest.cpp b/PluginCommandInterfaceCAPI/test/CAmCommandSenderCAPITest.cpp index 8285b6e..7cbc0c8 100644 --- a/PluginCommandInterfaceCAPI/test/CAmCommandSenderCAPITest.cpp +++ b/PluginCommandInterfaceCAPI/test/CAmCommandSenderCAPITest.cpp @@ -372,7 +372,7 @@ TEST_F(CAmCommandSenderCAPITest, GetListMainConnectionsTest) EXPECT_CALL(*env->mpCommandReceive, getListMainConnections(_)).WillOnce(DoAll(returnListConnections(), Return(E_OK))); org::genivi::am::am_MainConnection_L listConnections; - env->mProxy->getListMainConnections(callStatus, result, listConnections); + env->mProxy->getListMainConnections(callStatus, listConnections, result); ASSERT_EQ(result, org::genivi::am::am_Error_e::E_OK); ASSERT_EQ(1, listConnections.size()); ASSERT_EQ(15, listConnections.at(0).mainConnectionID); -- cgit v1.2.1