diff options
author | Aleksandar Donchev <aleksander.donchev@partner.bmw.de> | 2014-08-18 10:24:58 +0200 |
---|---|---|
committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-08-18 13:00:26 +0000 |
commit | 00caae1e41e8891d9a1bafa76028e8119f06fd8a (patch) | |
tree | e7a6e66c74c3f0b3579e87f8f738211d13129d71 | |
parent | a6eaa626d4c4bffe91d561cd71d0710f2e43e1c7 (diff) | |
download | audiomanager-baserock/6.0.tar.gz |
* Common-API sources re-generated for 2.1.6baserock/6.0
Signed-off-by: Christian Linke <christian.linke@bmw.de>
54 files changed, 2060 insertions, 768 deletions
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer.h index 916c744..6144745 100644 --- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer.h +++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer.h @@ -1,11 +1,24 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.genivi.commonapi.core 2.1.6.v20140519. * Used org.franca.core 0.8.11.201401091023. * -* 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/. +* 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 +* +* For further information see http://www.genivi.org/. */ /** * @author Christian Linke diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusProxy.cpp b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusProxy.cpp index 6971e07..2ff8d68 100644 --- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusProxy.cpp +++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusProxy.cpp @@ -1,11 +1,24 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.genivi.commonapi.core 2.1.6.v20140519. * Used org.franca.core 0.8.11.201401091023. * -* 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/. +* 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 +* +* For further information see http://www.genivi.org/. */ /** * @author Christian Linke @@ -26,7 +39,7 @@ std::shared_ptr<CommonAPI::DBus::DBusProxy> createConsumerDBusProxy( return std::make_shared<ConsumerDBusProxy>(factory, commonApiAddress, interfaceName, busName, objectPath, dbusProxyConnection); } -__attribute__((constructor)) void registerConsumerDBusProxy(void) { +INITIALIZER(registerConsumerDBusProxy) { CommonAPI::DBus::DBusFactory::registerProxyFactoryMethod(Consumer::getInterfaceId(), &createConsumerDBusProxy); } @@ -39,10 +52,10 @@ ConsumerDBusProxy::ConsumerDBusProxy( const std::string& objectPath, const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection>& dbusProxyconnection): CommonAPI::DBus::DBusProxy(factory, commonApiAddress, interfaceName, busName, objectPath, dbusProxyconnection) -,bootMode_(*this, "i", "getBootModeAttribute"), -restartReason_(*this, "i", "getRestartReasonAttribute"), -shutdownReason_(*this, "i", "getShutdownReasonAttribute"), -wakeUpReason_(*this, "i", "getWakeUpReasonAttribute") +,bootMode_(*this, interfaceName.c_str(), "BootMode"), +restartReason_(*this, interfaceName.c_str(), "RestartReason"), +shutdownReason_(*this, interfaceName.c_str(), "ShutdownReason"), +wakeUpReason_(*this, interfaceName.c_str(), "WakeUpReason") , nodeApplicationMode_(*this, "NodeApplicationMode", "i"), sessionStateChanged_(*this, "SessionStateChanged", "sii"), nodeState_(*this, "NodeState", "i") diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusProxy.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusProxy.h index 2e08248..4a70fbf 100644 --- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusProxy.h +++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusProxy.h @@ -1,11 +1,24 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.genivi.commonapi.core 2.1.6.v20140519. * Used org.franca.core 0.8.11.201401091023. * -* 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/. +* 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 +* +* For further information see http://www.genivi.org/. */ /** * @author Christian Linke @@ -80,10 +93,10 @@ class ConsumerDBusProxy: virtual public ConsumerProxyBase, virtual public Common virtual void getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const; private: - CommonAPI::DBus::DBusReadonlyAttribute<BootModeAttribute> bootMode_; - CommonAPI::DBus::DBusReadonlyAttribute<RestartReasonAttribute> restartReason_; - CommonAPI::DBus::DBusReadonlyAttribute<ShutdownReasonAttribute> shutdownReason_; - CommonAPI::DBus::DBusReadonlyAttribute<WakeUpReasonAttribute> wakeUpReason_; + CommonAPI::DBus::DBusFreedesktopReadonlyAttribute<BootModeAttribute> bootMode_; + CommonAPI::DBus::DBusFreedesktopReadonlyAttribute<RestartReasonAttribute> restartReason_; + CommonAPI::DBus::DBusFreedesktopReadonlyAttribute<ShutdownReasonAttribute> shutdownReason_; + CommonAPI::DBus::DBusFreedesktopReadonlyAttribute<WakeUpReasonAttribute> wakeUpReason_; CommonAPI::DBus::DBusEvent<NodeApplicationModeEvent> nodeApplicationMode_; CommonAPI::DBus::DBusEvent<SessionStateChangedEvent> sessionStateChanged_; diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusStubAdapter.cpp b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusStubAdapter.cpp index 7c00c67..d91ab4e 100755..100644 --- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusStubAdapter.cpp +++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusStubAdapter.cpp @@ -1,11 +1,24 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.genivi.commonapi.core 2.1.6.v20140519. * Used org.franca.core 0.8.11.201401091023. * -* 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/. +* 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 +* +* For further information see http://www.genivi.org/. */ #include "ConsumerDBusStubAdapter.h" #include <org/genivi/NodeStateManager/Consumer.h> @@ -25,7 +38,7 @@ std::shared_ptr<CommonAPI::DBus::DBusStubAdapter> createConsumerDBusStubAdapter( return std::make_shared<ConsumerDBusStubAdapter>(factory, commonApiAddress, interfaceName, busName, objectPath, dbusProxyConnection, stubBase); } -__attribute__((constructor)) void registerConsumerDBusStubAdapter(void) { +INITIALIZER(registerConsumerDBusStubAdapter) { CommonAPI::DBus::DBusFactory::registerAdapterFactoryMethod(Consumer::getInterfaceId(), &createConsumerDBusStubAdapter); } @@ -38,6 +51,7 @@ ConsumerDBusStubAdapterInternal::~ConsumerDBusStubAdapterInternal() { } void ConsumerDBusStubAdapterInternal::deactivateManagedInstances() { + } const char* ConsumerDBusStubAdapterInternal::getMethodsDBusIntrospectionXmlData() const { @@ -45,18 +59,10 @@ const char* ConsumerDBusStubAdapterInternal::getMethodsDBusIntrospectionXmlData( "<method name=\"getInterfaceVersion\">\n" "<arg name=\"value\" type=\"uu\" direction=\"out\" />" "</method>\n" - "<method name=\"getBootModeAttribute\">\n" - "<arg name=\"value\" type=\"i\" direction=\"out\" />" - "</method>\n" - "<method name=\"getRestartReasonAttribute\">\n" - "<arg name=\"value\" type=\"i\" direction=\"out\" />" - "</method>\n" - "<method name=\"getShutdownReasonAttribute\">\n" - "<arg name=\"value\" type=\"i\" direction=\"out\" />" - "</method>\n" - "<method name=\"getWakeUpReasonAttribute\">\n" - "<arg name=\"value\" type=\"i\" direction=\"out\" />" - "</method>\n" + "<property name=\"BootMode\" type=\"i\" access=\"read\" />\n" + "<property name=\"RestartReason\" type=\"i\" access=\"read\" />\n" + "<property name=\"ShutdownReason\" type=\"i\" access=\"read\" />\n" + "<property name=\"WakeUpReason\" type=\"i\" access=\"read\" />\n" "<signal name=\"NodeApplicationMode\">\n" "<arg name=\"ApplicationModeId\" type=\"i\" />\n" "</signal>\n" @@ -131,87 +137,85 @@ const char* ConsumerDBusStubAdapterInternal::getMethodsDBusIntrospectionXmlData( return introspectionData.c_str(); } -static CommonAPI::DBus::DBusGetAttributeStubDispatcher< +CommonAPI::DBus::DBusGetAttributeStubDispatcher< ConsumerStub, CommonAPI::Version - > getConsumerInterfaceVersionStubDispatcher(&ConsumerStub::getInterfaceVersion, "uu"); + > ConsumerDBusStubAdapterInternal::getConsumerInterfaceVersionStubDispatcher(&ConsumerStub::getInterfaceVersion, "uu"); -static CommonAPI::DBus::DBusGetAttributeStubDispatcher< +CommonAPI::DBus::DBusGetFreedesktopAttributeStubDispatcher< ConsumerStub, int32_t - > getBootModeAttributeStubDispatcher(&ConsumerStub::getBootModeAttribute, "i"); - -static CommonAPI::DBus::DBusGetAttributeStubDispatcher< + > ConsumerDBusStubAdapterInternal::getBootModeAttributeStubDispatcher(&ConsumerStub::getBootModeAttribute); +CommonAPI::DBus::DBusGetFreedesktopAttributeStubDispatcher< ConsumerStub, int32_t - > getRestartReasonAttributeStubDispatcher(&ConsumerStub::getRestartReasonAttribute, "i"); - -static CommonAPI::DBus::DBusGetAttributeStubDispatcher< + > ConsumerDBusStubAdapterInternal::getRestartReasonAttributeStubDispatcher(&ConsumerStub::getRestartReasonAttribute); +CommonAPI::DBus::DBusGetFreedesktopAttributeStubDispatcher< ConsumerStub, int32_t - > getShutdownReasonAttributeStubDispatcher(&ConsumerStub::getShutdownReasonAttribute, "i"); - -static CommonAPI::DBus::DBusGetAttributeStubDispatcher< + > ConsumerDBusStubAdapterInternal::getShutdownReasonAttributeStubDispatcher(&ConsumerStub::getShutdownReasonAttribute); +CommonAPI::DBus::DBusGetFreedesktopAttributeStubDispatcher< ConsumerStub, int32_t - > getWakeUpReasonAttributeStubDispatcher(&ConsumerStub::getWakeUpReasonAttribute, "i"); + > ConsumerDBusStubAdapterInternal::getWakeUpReasonAttributeStubDispatcher(&ConsumerStub::getWakeUpReasonAttribute); -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< ConsumerStub, std::tuple<>, std::tuple<uint32_t> - > getAppHealthCountStubDispatcher(&ConsumerStub::GetAppHealthCount, "u"); -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + > ConsumerDBusStubAdapterInternal::getAppHealthCountStubDispatcher(&ConsumerStub::GetAppHealthCount, "u"); +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< ConsumerStub, std::tuple<uint32_t, int32_t>, std::tuple<int32_t> - > lifecycleRequestCompleteStubDispatcher(&ConsumerStub::LifecycleRequestComplete, "i"); -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + > ConsumerDBusStubAdapterInternal::lifecycleRequestCompleteStubDispatcher(&ConsumerStub::LifecycleRequestComplete, "i"); +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< ConsumerStub, std::tuple<>, std::tuple<uint32_t> - > getInterfaceVersionStubDispatcher(&ConsumerStub::GetInterfaceVersion, "u"); -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + > ConsumerDBusStubAdapterInternal::getInterfaceVersionStubDispatcher(&ConsumerStub::GetInterfaceVersion, "u"); +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< ConsumerStub, std::tuple<>, std::tuple<int32_t, int32_t> - > getApplicationModeStubDispatcher(&ConsumerStub::GetApplicationMode, "ii"); -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + > ConsumerDBusStubAdapterInternal::getApplicationModeStubDispatcher(&ConsumerStub::GetApplicationMode, "ii"); +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< ConsumerStub, std::tuple<std::string, std::string, int32_t>, std::tuple<int32_t> - > unRegisterSessionStubDispatcher(&ConsumerStub::UnRegisterSession, "i"); -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + > ConsumerDBusStubAdapterInternal::unRegisterSessionStubDispatcher(&ConsumerStub::UnRegisterSession, "i"); +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< ConsumerStub, std::tuple<std::string, std::string, int32_t, int32_t>, std::tuple<int32_t> - > registerSessionStubDispatcher(&ConsumerStub::RegisterSession, "i"); -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + > ConsumerDBusStubAdapterInternal::registerSessionStubDispatcher(&ConsumerStub::RegisterSession, "i"); +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< ConsumerStub, std::tuple<std::string, std::string, uint32_t>, std::tuple<int32_t> - > unRegisterShutdownClientStubDispatcher(&ConsumerStub::UnRegisterShutdownClient, "i"); -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + > ConsumerDBusStubAdapterInternal::unRegisterShutdownClientStubDispatcher(&ConsumerStub::UnRegisterShutdownClient, "i"); +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< ConsumerStub, std::tuple<std::string, std::string, uint32_t, uint32_t>, std::tuple<int32_t> - > registerShutdownClientStubDispatcher(&ConsumerStub::RegisterShutdownClient, "i"); -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + > ConsumerDBusStubAdapterInternal::registerShutdownClientStubDispatcher(&ConsumerStub::RegisterShutdownClient, "i"); +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< ConsumerStub, std::tuple<>, std::tuple<int32_t, int32_t> - > getNodeStateStubDispatcher(&ConsumerStub::GetNodeState, "ii"); -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + > ConsumerDBusStubAdapterInternal::getNodeStateStubDispatcher(&ConsumerStub::GetNodeState, "ii"); +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< ConsumerStub, std::tuple<std::string, int32_t>, std::tuple<int32_t, int32_t> - > getSessionStateStubDispatcher(&ConsumerStub::GetSessionState, "ii"); -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + > ConsumerDBusStubAdapterInternal::getSessionStateStubDispatcher(&ConsumerStub::GetSessionState, "ii"); +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< ConsumerStub, std::tuple<std::string, std::string, int32_t, int32_t>, std::tuple<int32_t> - > setSessionStateStubDispatcher(&ConsumerStub::SetSessionState, "i"); + > ConsumerDBusStubAdapterInternal::setSessionStateStubDispatcher(&ConsumerStub::SetSessionState, "i"); + void ConsumerDBusStubAdapterInternal::fireNodeApplicationModeEvent(const int32_t& ApplicationModeId) { @@ -242,10 +246,14 @@ void ConsumerDBusStubAdapterInternal::fireNodeStateEvent(const int32_t& NodeStat ); } + const ConsumerDBusStubAdapterHelper::StubDispatcherTable& ConsumerDBusStubAdapterInternal::getStubDispatcherTable() { return stubDispatcherTable_; } +const CommonAPI::DBus::StubAttributeTable& ConsumerDBusStubAdapterInternal::getStubAttributeTable() { + return stubAttributeTable_; +} ConsumerDBusStubAdapterInternal::ConsumerDBusStubAdapterInternal( const std::shared_ptr<CommonAPI::DBus::DBusFactory>& factory, @@ -273,25 +281,55 @@ ConsumerDBusStubAdapterInternal::ConsumerDBusStubAdapterInternal( std::dynamic_pointer_cast<ConsumerStub>(stub), false), stubDispatcherTable_({ - { { "getBootModeAttribute", "" }, &org::genivi::NodeStateManager::getBootModeAttributeStubDispatcher }, - { { "getRestartReasonAttribute", "" }, &org::genivi::NodeStateManager::getRestartReasonAttributeStubDispatcher }, - { { "getShutdownReasonAttribute", "" }, &org::genivi::NodeStateManager::getShutdownReasonAttributeStubDispatcher }, - { { "getWakeUpReasonAttribute", "" }, &org::genivi::NodeStateManager::getWakeUpReasonAttributeStubDispatcher } - , - { { "GetAppHealthCount", "" }, &org::genivi::NodeStateManager::getAppHealthCountStubDispatcher }, - { { "LifecycleRequestComplete", "ui" }, &org::genivi::NodeStateManager::lifecycleRequestCompleteStubDispatcher }, - { { "GetInterfaceVersion", "" }, &org::genivi::NodeStateManager::getInterfaceVersionStubDispatcher }, - { { "GetApplicationMode", "" }, &org::genivi::NodeStateManager::getApplicationModeStubDispatcher }, - { { "UnRegisterSession", "ssi" }, &org::genivi::NodeStateManager::unRegisterSessionStubDispatcher }, - { { "RegisterSession", "ssii" }, &org::genivi::NodeStateManager::registerSessionStubDispatcher }, - { { "UnRegisterShutdownClient", "ssu" }, &org::genivi::NodeStateManager::unRegisterShutdownClientStubDispatcher }, - { { "RegisterShutdownClient", "ssuu" }, &org::genivi::NodeStateManager::registerShutdownClientStubDispatcher }, - { { "GetNodeState", "" }, &org::genivi::NodeStateManager::getNodeStateStubDispatcher }, - { { "GetSessionState", "si" }, &org::genivi::NodeStateManager::getSessionStateStubDispatcher }, - { { "SetSessionState", "ssii" }, &org::genivi::NodeStateManager::setSessionStateStubDispatcher } - }) { + { { "GetAppHealthCount", "" }, &org::genivi::NodeStateManager::ConsumerDBusStubAdapterInternal::getAppHealthCountStubDispatcher }, + { { "LifecycleRequestComplete", "ui" }, &org::genivi::NodeStateManager::ConsumerDBusStubAdapterInternal::lifecycleRequestCompleteStubDispatcher }, + { { "GetInterfaceVersion", "" }, &org::genivi::NodeStateManager::ConsumerDBusStubAdapterInternal::getInterfaceVersionStubDispatcher }, + { { "GetApplicationMode", "" }, &org::genivi::NodeStateManager::ConsumerDBusStubAdapterInternal::getApplicationModeStubDispatcher }, + { { "UnRegisterSession", "ssi" }, &org::genivi::NodeStateManager::ConsumerDBusStubAdapterInternal::unRegisterSessionStubDispatcher }, + { { "RegisterSession", "ssii" }, &org::genivi::NodeStateManager::ConsumerDBusStubAdapterInternal::registerSessionStubDispatcher }, + { { "UnRegisterShutdownClient", "ssu" }, &org::genivi::NodeStateManager::ConsumerDBusStubAdapterInternal::unRegisterShutdownClientStubDispatcher }, + { { "RegisterShutdownClient", "ssuu" }, &org::genivi::NodeStateManager::ConsumerDBusStubAdapterInternal::registerShutdownClientStubDispatcher }, + { { "GetNodeState", "" }, &org::genivi::NodeStateManager::ConsumerDBusStubAdapterInternal::getNodeStateStubDispatcher }, + { { "GetSessionState", "si" }, &org::genivi::NodeStateManager::ConsumerDBusStubAdapterInternal::getSessionStateStubDispatcher }, + { { "SetSessionState", "ssii" }, &org::genivi::NodeStateManager::ConsumerDBusStubAdapterInternal::setSessionStateStubDispatcher } + }), + stubAttributeTable_({ + { + "BootMode", + { + &org::genivi::NodeStateManager::ConsumerDBusStubAdapterInternal::getBootModeAttributeStubDispatcher, + NULL + } + }, + { + "RestartReason", + { + &org::genivi::NodeStateManager::ConsumerDBusStubAdapterInternal::getRestartReasonAttributeStubDispatcher, + NULL + } + }, + { + "ShutdownReason", + { + &org::genivi::NodeStateManager::ConsumerDBusStubAdapterInternal::getShutdownReasonAttributeStubDispatcher, + NULL + } + }, + { + "WakeUpReason", + { + &org::genivi::NodeStateManager::ConsumerDBusStubAdapterInternal::getWakeUpReasonAttributeStubDispatcher, + NULL + } + } + } + ) { + + stubDispatcherTable_.insert({ { "getInterfaceVersion", "" }, &org::genivi::NodeStateManager::ConsumerDBusStubAdapterInternal::getConsumerInterfaceVersionStubDispatcher }); +} - stubDispatcherTable_.insert({ { "getInterfaceVersion", "" }, &org::genivi::NodeStateManager::getConsumerInterfaceVersionStubDispatcher }); +const bool ConsumerDBusStubAdapterInternal::hasFreedesktopProperties() { + return true; } } // namespace NodeStateManager diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusStubAdapter.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusStubAdapter.h index d8335d7..6727980 100755..100644 --- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusStubAdapter.h +++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusStubAdapter.h @@ -1,11 +1,24 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.genivi.commonapi.core 2.1.6.v20140519. * Used org.franca.core 0.8.11.201401091023. * -* 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/. +* 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 +* +* For further information see http://www.genivi.org/. */ /** * @author Christian Linke @@ -32,7 +45,7 @@ namespace NodeStateManager { typedef CommonAPI::DBus::DBusStubAdapterHelper<ConsumerStub> ConsumerDBusStubAdapterHelper; -class ConsumerDBusStubAdapterInternal: public ConsumerStubAdapter, public ConsumerDBusStubAdapterHelper { +class ConsumerDBusStubAdapterInternal: public virtual ConsumerStubAdapter, public ConsumerDBusStubAdapterHelper { public: ConsumerDBusStubAdapterInternal( const std::shared_ptr<CommonAPI::DBus::DBusFactory>& factory, @@ -45,6 +58,8 @@ class ConsumerDBusStubAdapterInternal: public ConsumerStubAdapter, public Consum ~ConsumerDBusStubAdapterInternal(); + virtual const bool hasFreedesktopProperties(); + void fireNodeApplicationModeEvent(const int32_t& ApplicationModeId); void fireSessionStateChangedEvent(const std::string& SessionStateName, const int32_t& SeatID, const int32_t& SessionState); @@ -52,15 +67,99 @@ class ConsumerDBusStubAdapterInternal: public ConsumerStubAdapter, public Consum const ConsumerDBusStubAdapterHelper::StubDispatcherTable& getStubDispatcherTable(); + const CommonAPI::DBus::StubAttributeTable& getStubAttributeTable(); void deactivateManagedInstances(); +static CommonAPI::DBus::DBusGetAttributeStubDispatcher< + ConsumerStub, + CommonAPI::Version + > getConsumerInterfaceVersionStubDispatcher; + +static CommonAPI::DBus::DBusGetFreedesktopAttributeStubDispatcher< + ConsumerStub, + int32_t + > getBootModeAttributeStubDispatcher; +static CommonAPI::DBus::DBusGetFreedesktopAttributeStubDispatcher< + ConsumerStub, + int32_t + > getRestartReasonAttributeStubDispatcher; +static CommonAPI::DBus::DBusGetFreedesktopAttributeStubDispatcher< + ConsumerStub, + int32_t + > getShutdownReasonAttributeStubDispatcher; +static CommonAPI::DBus::DBusGetFreedesktopAttributeStubDispatcher< + ConsumerStub, + int32_t + > getWakeUpReasonAttributeStubDispatcher; + + +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + ConsumerStub, + std::tuple<>, + std::tuple<uint32_t> + > getAppHealthCountStubDispatcher; +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + ConsumerStub, + std::tuple<uint32_t, int32_t>, + std::tuple<int32_t> + > lifecycleRequestCompleteStubDispatcher; +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + ConsumerStub, + std::tuple<>, + std::tuple<uint32_t> + > getInterfaceVersionStubDispatcher; +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + ConsumerStub, + std::tuple<>, + std::tuple<int32_t, int32_t> + > getApplicationModeStubDispatcher; +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + ConsumerStub, + std::tuple<std::string, std::string, int32_t>, + std::tuple<int32_t> + > unRegisterSessionStubDispatcher; +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + ConsumerStub, + std::tuple<std::string, std::string, int32_t, int32_t>, + std::tuple<int32_t> + > registerSessionStubDispatcher; +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + ConsumerStub, + std::tuple<std::string, std::string, uint32_t>, + std::tuple<int32_t> + > unRegisterShutdownClientStubDispatcher; +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + ConsumerStub, + std::tuple<std::string, std::string, uint32_t, uint32_t>, + std::tuple<int32_t> + > registerShutdownClientStubDispatcher; +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + ConsumerStub, + std::tuple<>, + std::tuple<int32_t, int32_t> + > getNodeStateStubDispatcher; +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + ConsumerStub, + std::tuple<std::string, int32_t>, + std::tuple<int32_t, int32_t> + > getSessionStateStubDispatcher; +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + ConsumerStub, + std::tuple<std::string, std::string, int32_t, int32_t>, + std::tuple<int32_t> + > setSessionStateStubDispatcher; + + + + protected: virtual const char* getMethodsDBusIntrospectionXmlData() const; - - private: + + private: ConsumerDBusStubAdapterHelper::StubDispatcherTable stubDispatcherTable_; + CommonAPI::DBus::StubAttributeTable stubAttributeTable_; }; class ConsumerDBusStubAdapter: public ConsumerDBusStubAdapterInternal, public std::enable_shared_from_this<ConsumerDBusStubAdapter> { diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerProxy.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerProxy.h index bd473f1..c94aec7 100644 --- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerProxy.h +++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerProxy.h @@ -1,11 +1,24 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.genivi.commonapi.core 2.1.6.v20140519. * Used org.franca.core 0.8.11.201401091023. * -* 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/. +* 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 +* +* For further information see http://www.genivi.org/. */ /** * @author Christian Linke @@ -358,6 +371,12 @@ public: std::shared_ptr<ConsumerProxyBase> delegate_; }; +#ifdef WIN32 + typedef ConsumerProxy<CommonAPI::WINDummyAttributeExtension<CommonAPI::WINDummyAttribute>> ConsumerProxyDefault; +#else + typedef ConsumerProxy<> ConsumerProxyDefault; +#endif + namespace ConsumerExtensions { template <template <typename > class _ExtensionType> class BootModeAttributeExtension { @@ -366,6 +385,9 @@ namespace ConsumerExtensions { static_assert(std::is_base_of<typename CommonAPI::AttributeExtension<ConsumerProxyBase::BootModeAttribute>, extension_type>::value, "Not CommonAPI Attribute Extension!"); + #ifdef WIN32 + BootModeAttributeExtension() {} + #endif BootModeAttributeExtension(ConsumerProxyBase& proxy): attributeExtension_(proxy.getBootModeAttribute()) { } @@ -385,6 +407,9 @@ namespace ConsumerExtensions { static_assert(std::is_base_of<typename CommonAPI::AttributeExtension<ConsumerProxyBase::RestartReasonAttribute>, extension_type>::value, "Not CommonAPI Attribute Extension!"); + #ifdef WIN32 + RestartReasonAttributeExtension() {} + #endif RestartReasonAttributeExtension(ConsumerProxyBase& proxy): attributeExtension_(proxy.getRestartReasonAttribute()) { } @@ -404,6 +429,9 @@ namespace ConsumerExtensions { static_assert(std::is_base_of<typename CommonAPI::AttributeExtension<ConsumerProxyBase::ShutdownReasonAttribute>, extension_type>::value, "Not CommonAPI Attribute Extension!"); + #ifdef WIN32 + ShutdownReasonAttributeExtension() {} + #endif ShutdownReasonAttributeExtension(ConsumerProxyBase& proxy): attributeExtension_(proxy.getShutdownReasonAttribute()) { } @@ -423,6 +451,9 @@ namespace ConsumerExtensions { static_assert(std::is_base_of<typename CommonAPI::AttributeExtension<ConsumerProxyBase::WakeUpReasonAttribute>, extension_type>::value, "Not CommonAPI Attribute Extension!"); + #ifdef WIN32 + WakeUpReasonAttributeExtension() {} + #endif WakeUpReasonAttributeExtension(ConsumerProxyBase& proxy): attributeExtension_(proxy.getWakeUpReasonAttribute()) { } @@ -442,8 +473,8 @@ namespace ConsumerExtensions { // template <typename ... _AttributeExtensions> ConsumerProxy<_AttributeExtensions...>::ConsumerProxy(std::shared_ptr<CommonAPI::Proxy> delegate): - delegate_(std::dynamic_pointer_cast<ConsumerProxyBase>(delegate)), - _AttributeExtensions(*(std::dynamic_pointer_cast<ConsumerProxyBase>(delegate)))... { + _AttributeExtensions(*(std::dynamic_pointer_cast<ConsumerProxyBase>(delegate)))..., + delegate_(std::dynamic_pointer_cast<ConsumerProxyBase>(delegate)) { } template <typename ... _AttributeExtensions> diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerProxyBase.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerProxyBase.h index a5d9ed8..c657cc2 100644 --- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerProxyBase.h +++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerProxyBase.h @@ -1,11 +1,24 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.genivi.commonapi.core 2.1.6.v20140519. * Used org.franca.core 0.8.11.201401091023. * -* 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/. +* 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 +* +* For further information see http://www.genivi.org/. */ /** * @author Christian Linke diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStub.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStub.h index c56949a..5406109 100644 --- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStub.h +++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStub.h @@ -1,11 +1,24 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.genivi.commonapi.core 2.1.6.v20140519. * Used org.franca.core 0.8.11.201401091023. * -* 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/. +* 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 +* +* For further information see http://www.genivi.org/. */ /** * @author Christian Linke @@ -97,7 +110,7 @@ class ConsumerStubRemoteEvent { * This class and the one above are the ones an application developer needs to have * a look at if he wants to implement a service. */ -class ConsumerStub : public virtual CommonAPI::Stub<ConsumerStubAdapter, ConsumerStubRemoteEvent> { +class ConsumerStub: public virtual CommonAPI::Stub<ConsumerStubAdapter, ConsumerStubRemoteEvent> { public: virtual ~ConsumerStub() { } virtual const CommonAPI::Version& getInterfaceVersion(std::shared_ptr<CommonAPI::ClientId> clientId) = 0; @@ -143,6 +156,8 @@ public: using CommonAPI::Stub<ConsumerStubAdapter, ConsumerStubRemoteEvent>::initStubAdapter; typedef CommonAPI::Stub<ConsumerStubAdapter, ConsumerStubRemoteEvent>::StubAdapterType StubAdapterType; typedef CommonAPI::Stub<ConsumerStubAdapter, ConsumerStubRemoteEvent>::RemoteEventHandlerType RemoteEventHandlerType; + typedef ConsumerStubRemoteEvent RemoteEventType; + typedef Consumer StubInterface; }; } // namespace NodeStateManager diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStubDefault.cpp b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStubDefault.cpp index 1e34da5..e732c0c 100644 --- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStubDefault.cpp +++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStubDefault.cpp @@ -1,11 +1,24 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.genivi.commonapi.core 2.1.6.v20140519. * Used org.franca.core 0.8.11.201401091023. * -* 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/. +* 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 +* +* For further information see http://www.genivi.org/. */ #include <org/genivi/NodeStateManager/ConsumerStubDefault.h> diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStubDefault.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStubDefault.h index 80dc926..3d2c5cc 100644 --- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStubDefault.h +++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStubDefault.h @@ -1,11 +1,24 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.genivi.commonapi.core 2.1.6.v20140519. * Used org.franca.core 0.8.11.201401091023. * -* 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/. +* 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 +* +* For further information see http://www.genivi.org/. */ /** * @author Christian Linke @@ -100,8 +113,7 @@ protected: virtual bool validateShutdownReasonAttributeRequestedValue(const int32_t& value); virtual bool trySetWakeUpReasonAttribute(int32_t value); virtual bool validateWakeUpReasonAttributeRequestedValue(const int32_t& value); -private: - class RemoteEventHandler: public ConsumerStubRemoteEvent { + class RemoteEventHandler: public virtual ConsumerStubRemoteEvent { public: RemoteEventHandler(ConsumerStubDefault* defaultStub); @@ -113,8 +125,8 @@ private: private: ConsumerStubDefault* defaultStub_; }; - - RemoteEventHandler remoteEventHandler_; +private: + ConsumerStubDefault::RemoteEventHandler remoteEventHandler_; int32_t bootModeAttributeValue_; int32_t restartReasonAttributeValue_; diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer.h index 56cbf4c..6489ee7 100644 --- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer.h +++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer.h @@ -1,11 +1,24 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.genivi.commonapi.core 2.1.6.v20140519. * Used org.franca.core 0.8.11.201401091023. * -* 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/. +* 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 +* +* For further information see http://www.genivi.org/. */ /** * @author Christian Linke diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusProxy.cpp b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusProxy.cpp index ab06c26..b12e3bb 100644 --- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusProxy.cpp +++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusProxy.cpp @@ -1,11 +1,24 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.genivi.commonapi.core 2.1.6.v20140519. * Used org.franca.core 0.8.11.201401091023. * -* 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/. +* 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 +* +* For further information see http://www.genivi.org/. */ /** * @author Christian Linke @@ -26,7 +39,7 @@ std::shared_ptr<CommonAPI::DBus::DBusProxy> createLifeCycleConsumerDBusProxy( return std::make_shared<LifeCycleConsumerDBusProxy>(factory, commonApiAddress, interfaceName, busName, objectPath, dbusProxyConnection); } -__attribute__((constructor)) void registerLifeCycleConsumerDBusProxy(void) { +INITIALIZER(registerLifeCycleConsumerDBusProxy) { CommonAPI::DBus::DBusFactory::registerProxyFactoryMethod(LifeCycleConsumer::getInterfaceId(), &createLifeCycleConsumerDBusProxy); } diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusProxy.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusProxy.h index d69d805..8cec268 100644 --- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusProxy.h +++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusProxy.h @@ -1,11 +1,24 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.genivi.commonapi.core 2.1.6.v20140519. * Used org.franca.core 0.8.11.201401091023. * -* 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/. +* 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 +* +* For further information see http://www.genivi.org/. */ /** * @author Christian Linke diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusStubAdapter.cpp b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusStubAdapter.cpp index 96ac35b..3aa9142 100644 --- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusStubAdapter.cpp +++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusStubAdapter.cpp @@ -1,11 +1,24 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.genivi.commonapi.core 2.1.6.v20140519. * Used org.franca.core 0.8.11.201401091023. * -* 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/. +* 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 +* +* For further information see http://www.genivi.org/. */ #include "LifeCycleConsumerDBusStubAdapter.h" #include <org/genivi/NodeStateManager/LifeCycleConsumer.h> @@ -25,7 +38,7 @@ std::shared_ptr<CommonAPI::DBus::DBusStubAdapter> createLifeCycleConsumerDBusStu return std::make_shared<LifeCycleConsumerDBusStubAdapter>(factory, commonApiAddress, interfaceName, busName, objectPath, dbusProxyConnection, stubBase); } -__attribute__((constructor)) void registerLifeCycleConsumerDBusStubAdapter(void) { +INITIALIZER(registerLifeCycleConsumerDBusStubAdapter) { CommonAPI::DBus::DBusFactory::registerAdapterFactoryMethod(LifeCycleConsumer::getInterfaceId(), &createLifeCycleConsumerDBusStubAdapter); } @@ -38,6 +51,7 @@ LifeCycleConsumerDBusStubAdapterInternal::~LifeCycleConsumerDBusStubAdapterInter } void LifeCycleConsumerDBusStubAdapterInternal::deactivateManagedInstances() { + } const char* LifeCycleConsumerDBusStubAdapterInternal::getMethodsDBusIntrospectionXmlData() const { @@ -55,17 +69,20 @@ const char* LifeCycleConsumerDBusStubAdapterInternal::getMethodsDBusIntrospectio return introspectionData.c_str(); } -static CommonAPI::DBus::DBusGetAttributeStubDispatcher< +CommonAPI::DBus::DBusGetAttributeStubDispatcher< LifeCycleConsumerStub, CommonAPI::Version - > getLifeCycleConsumerInterfaceVersionStubDispatcher(&LifeCycleConsumerStub::getInterfaceVersion, "uu"); + > LifeCycleConsumerDBusStubAdapterInternal::getLifeCycleConsumerInterfaceVersionStubDispatcher(&LifeCycleConsumerStub::getInterfaceVersion, "uu"); + -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< LifeCycleConsumerStub, std::tuple<uint32_t, uint32_t>, std::tuple<int32_t> - > lifecycleRequestStubDispatcher(&LifeCycleConsumerStub::LifecycleRequest, "i"); + > LifeCycleConsumerDBusStubAdapterInternal::lifecycleRequestStubDispatcher(&LifeCycleConsumerStub::LifecycleRequest, "i"); + + @@ -73,6 +90,9 @@ const LifeCycleConsumerDBusStubAdapterHelper::StubDispatcherTable& LifeCycleCons return stubDispatcherTable_; } +const CommonAPI::DBus::StubAttributeTable& LifeCycleConsumerDBusStubAdapterInternal::getStubAttributeTable() { + return stubAttributeTable_; +} LifeCycleConsumerDBusStubAdapterInternal::LifeCycleConsumerDBusStubAdapterInternal( const std::shared_ptr<CommonAPI::DBus::DBusFactory>& factory, @@ -100,10 +120,15 @@ LifeCycleConsumerDBusStubAdapterInternal::LifeCycleConsumerDBusStubAdapterIntern std::dynamic_pointer_cast<LifeCycleConsumerStub>(stub), false), stubDispatcherTable_({ - { { "LifecycleRequest", "uu" }, &org::genivi::NodeStateManager::lifecycleRequestStubDispatcher } - }) { + { { "LifecycleRequest", "uu" }, &org::genivi::NodeStateManager::LifeCycleConsumerDBusStubAdapterInternal::lifecycleRequestStubDispatcher } + }), + stubAttributeTable_() { + + stubDispatcherTable_.insert({ { "getInterfaceVersion", "" }, &org::genivi::NodeStateManager::LifeCycleConsumerDBusStubAdapterInternal::getLifeCycleConsumerInterfaceVersionStubDispatcher }); +} - stubDispatcherTable_.insert({ { "getInterfaceVersion", "" }, &org::genivi::NodeStateManager::getLifeCycleConsumerInterfaceVersionStubDispatcher }); +const bool LifeCycleConsumerDBusStubAdapterInternal::hasFreedesktopProperties() { + return false; } } // namespace NodeStateManager diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusStubAdapter.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusStubAdapter.h index c03f0c3..006c674 100644 --- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusStubAdapter.h +++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusStubAdapter.h @@ -1,11 +1,24 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.genivi.commonapi.core 2.1.6.v20140519. * Used org.franca.core 0.8.11.201401091023. * -* 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/. +* 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 +* +* For further information see http://www.genivi.org/. */ /** * @author Christian Linke @@ -32,7 +45,7 @@ namespace NodeStateManager { typedef CommonAPI::DBus::DBusStubAdapterHelper<LifeCycleConsumerStub> LifeCycleConsumerDBusStubAdapterHelper; -class LifeCycleConsumerDBusStubAdapterInternal: public LifeCycleConsumerStubAdapter, public LifeCycleConsumerDBusStubAdapterHelper { +class LifeCycleConsumerDBusStubAdapterInternal: public virtual LifeCycleConsumerStubAdapter, public LifeCycleConsumerDBusStubAdapterHelper { public: LifeCycleConsumerDBusStubAdapterInternal( const std::shared_ptr<CommonAPI::DBus::DBusFactory>& factory, @@ -45,19 +58,39 @@ class LifeCycleConsumerDBusStubAdapterInternal: public LifeCycleConsumerStubAdap ~LifeCycleConsumerDBusStubAdapterInternal(); + virtual const bool hasFreedesktopProperties(); + const LifeCycleConsumerDBusStubAdapterHelper::StubDispatcherTable& getStubDispatcherTable(); + const CommonAPI::DBus::StubAttributeTable& getStubAttributeTable(); void deactivateManagedInstances(); +static CommonAPI::DBus::DBusGetAttributeStubDispatcher< + LifeCycleConsumerStub, + CommonAPI::Version + > getLifeCycleConsumerInterfaceVersionStubDispatcher; + + + +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + LifeCycleConsumerStub, + std::tuple<uint32_t, uint32_t>, + std::tuple<int32_t> + > lifecycleRequestStubDispatcher; + + + + protected: virtual const char* getMethodsDBusIntrospectionXmlData() const; - - private: + + private: LifeCycleConsumerDBusStubAdapterHelper::StubDispatcherTable stubDispatcherTable_; + CommonAPI::DBus::StubAttributeTable stubAttributeTable_; }; class LifeCycleConsumerDBusStubAdapter: public LifeCycleConsumerDBusStubAdapterInternal, public std::enable_shared_from_this<LifeCycleConsumerDBusStubAdapter> { diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerProxy.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerProxy.h index 374ef1e..0f1d8bc 100644 --- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerProxy.h +++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerProxy.h @@ -1,11 +1,24 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.genivi.commonapi.core 2.1.6.v20140519. * Used org.franca.core 0.8.11.201401091023. * -* 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/. +* 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 +* +* For further information see http://www.genivi.org/. */ /** * @author Christian Linke @@ -108,14 +121,20 @@ public: std::shared_ptr<LifeCycleConsumerProxyBase> delegate_; }; +#ifdef WIN32 + typedef LifeCycleConsumerProxy<CommonAPI::WINDummyAttributeExtension<CommonAPI::WINDummyAttribute>> LifeCycleConsumerProxyDefault; +#else + typedef LifeCycleConsumerProxy<> LifeCycleConsumerProxyDefault; +#endif + // // LifeCycleConsumerProxy Implementation // template <typename ... _AttributeExtensions> LifeCycleConsumerProxy<_AttributeExtensions...>::LifeCycleConsumerProxy(std::shared_ptr<CommonAPI::Proxy> delegate): - delegate_(std::dynamic_pointer_cast<LifeCycleConsumerProxyBase>(delegate)), - _AttributeExtensions(*(std::dynamic_pointer_cast<LifeCycleConsumerProxyBase>(delegate)))... { + _AttributeExtensions(*(std::dynamic_pointer_cast<LifeCycleConsumerProxyBase>(delegate)))..., + delegate_(std::dynamic_pointer_cast<LifeCycleConsumerProxyBase>(delegate)) { } template <typename ... _AttributeExtensions> diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerProxyBase.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerProxyBase.h index ad8ee6a..299b9eb 100644 --- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerProxyBase.h +++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerProxyBase.h @@ -1,11 +1,24 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.genivi.commonapi.core 2.1.6.v20140519. * Used org.franca.core 0.8.11.201401091023. * -* 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/. +* 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 +* +* For further information see http://www.genivi.org/. */ /** * @author Christian Linke diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStub.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStub.h index 58f5bb0..14b89d6 100644 --- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStub.h +++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStub.h @@ -1,11 +1,24 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.genivi.commonapi.core 2.1.6.v20140519. * Used org.franca.core 0.8.11.201401091023. * -* 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/. +* 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 +* +* For further information see http://www.genivi.org/. */ /** * @author Christian Linke @@ -77,7 +90,7 @@ class LifeCycleConsumerStubRemoteEvent { * This class and the one above are the ones an application developer needs to have * a look at if he wants to implement a service. */ -class LifeCycleConsumerStub : public virtual CommonAPI::Stub<LifeCycleConsumerStubAdapter, LifeCycleConsumerStubRemoteEvent> { +class LifeCycleConsumerStub: public virtual CommonAPI::Stub<LifeCycleConsumerStubAdapter, LifeCycleConsumerStubRemoteEvent> { public: virtual ~LifeCycleConsumerStub() { } virtual const CommonAPI::Version& getInterfaceVersion(std::shared_ptr<CommonAPI::ClientId> clientId) = 0; @@ -89,6 +102,8 @@ public: using CommonAPI::Stub<LifeCycleConsumerStubAdapter, LifeCycleConsumerStubRemoteEvent>::initStubAdapter; typedef CommonAPI::Stub<LifeCycleConsumerStubAdapter, LifeCycleConsumerStubRemoteEvent>::StubAdapterType StubAdapterType; typedef CommonAPI::Stub<LifeCycleConsumerStubAdapter, LifeCycleConsumerStubRemoteEvent>::RemoteEventHandlerType RemoteEventHandlerType; + typedef LifeCycleConsumerStubRemoteEvent RemoteEventType; + typedef LifeCycleConsumer StubInterface; }; } // namespace NodeStateManager diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStubDefault.cpp b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStubDefault.cpp index 03801fa..420b95e 100644 --- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStubDefault.cpp +++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStubDefault.cpp @@ -1,11 +1,24 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.genivi.commonapi.core 2.1.6.v20140519. * Used org.franca.core 0.8.11.201401091023. * -* 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/. +* 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 +* +* For further information see http://www.genivi.org/. */ #include <org/genivi/NodeStateManager/LifeCycleConsumerStubDefault.h> diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStubDefault.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStubDefault.h index fe35b9f..eb05ec3 100644 --- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStubDefault.h +++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStubDefault.h @@ -1,11 +1,24 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.genivi.commonapi.core 2.1.6.v20140519. * Used org.franca.core 0.8.11.201401091023. * -* 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/. +* 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 +* +* For further information see http://www.genivi.org/. */ /** * @author Christian Linke @@ -47,8 +60,7 @@ public: protected: -private: - class RemoteEventHandler: public LifeCycleConsumerStubRemoteEvent { + class RemoteEventHandler: public virtual LifeCycleConsumerStubRemoteEvent { public: RemoteEventHandler(LifeCycleConsumerStubDefault* defaultStub); @@ -56,8 +68,8 @@ private: private: LifeCycleConsumerStubDefault* defaultStub_; }; - - RemoteEventHandler remoteEventHandler_; +private: + LifeCycleConsumerStubDefault::RemoteEventHandler remoteEventHandler_; CommonAPI::Version interfaceVersion_; diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am.cpp b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am.cpp index 161a7b7..7170981 100644 --- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am.cpp +++ b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am.cpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.genivi.commonapi.core 2.1.6.v20140519. * Used org.franca.core 0.8.11.201401091023. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am.h b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am.h index 17c0c51..ce9ea60 100644 --- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am.h +++ b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am.h @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.genivi.commonapi.core 2.1.6.v20140519. * Used org.franca.core 0.8.11.201401091023. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. @@ -714,15 +714,15 @@ namespace am { am_NotificationStatus_e status; /** * This gives additional information to the notification status. - Relation - * between notification status and the value: - NS_PERIODIC - the period in - * ms - NS_MINIMUM - the minimum value that triggers the notification - NS_MAXIMUM - * - the maximum value that triggers the notifcation - NS_CHANGE - the resolution - * of the change value + Relation between + * notification status and the value: + NS_PERIODIC - the period in ms + NS_MINIMUM + * - the minimum value that triggers the notification + NS_MAXIMUM - the maximum + * value that triggers the notifcation + NS_CHANGE - the resolution of the change + * value */ int16_t parameter; @@ -1155,8 +1155,8 @@ namespace am { /** * This enum can have 3 states: - HS_SINKA sinkA is the current hot one, - * sinkB is not audible + HS_SINKA sinkA is the current hot one, sinkB + * is not audible HS_SINKB sinkB is the current hot one, sinkB is not * audible HS_INTERMEDIATE the fader is stuck in between a cross-fading @@ -1571,11 +1571,11 @@ namespace am { * tuner that is not actively heard. The source state is set by the * AudioManagerController.There are 3 possible states: - SS_ON: the source - * is active + SS_ON: the source is + * active SS_OFF: the source is off - SS_PAUSED: the source is paused - * and not active. + SS_PAUSED: the source is paused and + * not active. */ am_SourceState_e sourceState; /** @@ -2076,7 +2076,7 @@ static inline const char* getTypeCollectionName() { } inline CommonAPI::Version getTypeCollectionVersion() { - return CommonAPI::Version(1, 0); + return CommonAPI::Version(2, 0); } } // namespace am @@ -2096,7 +2096,6 @@ namespace CommonAPI { template<> struct InputStreamVectorHelper<org::genivi::am::am_Availability_e> { static void beginReadVector(InputStream& inputStream, const std::vector<org::genivi::am::am_Availability_e>& vectorValue) { - (void)vectorValue; inputStream.beginReadInt32EnumVector(); } }; @@ -2117,7 +2116,6 @@ namespace CommonAPI { template<> struct InputStreamVectorHelper<org::genivi::am::am_HotSink_e> { static void beginReadVector(InputStream& inputStream, const std::vector<org::genivi::am::am_HotSink_e>& vectorValue) { - (void)vectorValue; inputStream.beginReadInt32EnumVector(); } }; @@ -2138,7 +2136,6 @@ namespace CommonAPI { template<> struct InputStreamVectorHelper<org::genivi::am::am_ConnectionState_e> { static void beginReadVector(InputStream& inputStream, const std::vector<org::genivi::am::am_ConnectionState_e>& vectorValue) { - (void)vectorValue; inputStream.beginReadInt32EnumVector(); } }; @@ -2159,7 +2156,6 @@ namespace CommonAPI { template<> struct InputStreamVectorHelper<org::genivi::am::am_DomainState_e> { static void beginReadVector(InputStream& inputStream, const std::vector<org::genivi::am::am_DomainState_e>& vectorValue) { - (void)vectorValue; inputStream.beginReadInt32EnumVector(); } }; @@ -2180,7 +2176,6 @@ namespace CommonAPI { template<> struct InputStreamVectorHelper<org::genivi::am::am_EarlyDataType_e> { static void beginReadVector(InputStream& inputStream, const std::vector<org::genivi::am::am_EarlyDataType_e>& vectorValue) { - (void)vectorValue; inputStream.beginReadInt32EnumVector(); } }; @@ -2201,7 +2196,6 @@ namespace CommonAPI { template<> struct InputStreamVectorHelper<org::genivi::am::am_Error_e> { static void beginReadVector(InputStream& inputStream, const std::vector<org::genivi::am::am_Error_e>& vectorValue) { - (void)vectorValue; inputStream.beginReadInt32EnumVector(); } }; @@ -2222,7 +2216,6 @@ namespace CommonAPI { template<> struct InputStreamVectorHelper<org::genivi::am::am_MuteState_e> { static void beginReadVector(InputStream& inputStream, const std::vector<org::genivi::am::am_MuteState_e>& vectorValue) { - (void)vectorValue; inputStream.beginReadInt32EnumVector(); } }; @@ -2243,7 +2236,6 @@ namespace CommonAPI { template<> struct InputStreamVectorHelper<org::genivi::am::am_InterruptState_e> { static void beginReadVector(InputStream& inputStream, const std::vector<org::genivi::am::am_InterruptState_e>& vectorValue) { - (void)vectorValue; inputStream.beginReadInt32EnumVector(); } }; @@ -2264,7 +2256,6 @@ namespace CommonAPI { template<> struct InputStreamVectorHelper<org::genivi::am::am_VolumeType_e> { static void beginReadVector(InputStream& inputStream, const std::vector<org::genivi::am::am_VolumeType_e>& vectorValue) { - (void)vectorValue; inputStream.beginReadInt32EnumVector(); } }; @@ -2285,7 +2276,6 @@ namespace CommonAPI { template<> struct InputStreamVectorHelper<org::genivi::am::am_NotificationStatus_e> { static void beginReadVector(InputStream& inputStream, const std::vector<org::genivi::am::am_NotificationStatus_e>& vectorValue) { - (void)vectorValue; inputStream.beginReadInt32EnumVector(); } }; @@ -2306,7 +2296,6 @@ namespace CommonAPI { template<> struct InputStreamVectorHelper<org::genivi::am::am_Handle_e> { static void beginReadVector(InputStream& inputStream, const std::vector<org::genivi::am::am_Handle_e>& vectorValue) { - (void)vectorValue; inputStream.beginReadInt32EnumVector(); } }; @@ -2327,7 +2316,6 @@ namespace CommonAPI { template<> struct InputStreamVectorHelper<org::genivi::am::am_SourceState_e> { static void beginReadVector(InputStream& inputStream, const std::vector<org::genivi::am::am_SourceState_e>& vectorValue) { - (void)vectorValue; inputStream.beginReadInt32EnumVector(); } }; @@ -2348,7 +2336,6 @@ namespace CommonAPI { template<> struct InputStreamVectorHelper<org::genivi::am::am_RoutingReady_e> { static void beginReadVector(InputStream& inputStream, const std::vector<org::genivi::am::am_RoutingReady_e>& vectorValue) { - (void)vectorValue; inputStream.beginReadInt32EnumVector(); } }; diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControl.h b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControl.h index eb103e5..835be6e 100644 --- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControl.h +++ b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControl.h @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.genivi.commonapi.core 2.1.6.v20140519. * Used org.franca.core 0.8.11.201401091023. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. @@ -47,7 +47,7 @@ const char* CommandControl::getInterfaceId() { } CommonAPI::Version CommandControl::getInterfaceVersion() { - return CommonAPI::Version(1, 0); + return CommonAPI::Version(2, 0); } diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusProxy.cpp b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusProxy.cpp index e147744..21c3f43 100644 --- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusProxy.cpp +++ b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusProxy.cpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.genivi.commonapi.core 2.1.6.v20140519. * Used org.franca.core 0.8.11.201401091023. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. @@ -31,11 +31,11 @@ std::shared_ptr<CommonAPI::DBus::DBusProxy> createCommandControlDBusProxy( return std::make_shared<CommandControlDBusProxy>(factory, commonApiAddress, interfaceName, busName, objectPath, dbusProxyConnection); } -__attribute__((constructor)) void registerCommandControlDBusProxy(void) { +INITIALIZER(registerCommandControlDBusProxy) { CommonAPI::DBus::DBusFactory::registerProxyFactoryMethod(CommandControl::getInterfaceId(), &createCommandControlDBusProxy); } - + CommandControlDBusProxy::CommandControlDBusProxy( const std::shared_ptr<CommonAPI::DBus::DBusFactory>& factory, const std::string& commonApiAddress, @@ -216,26 +216,26 @@ std::future<CommonAPI::CallStatus> CommandControlDBusProxy::setVolumeAsync(const /** * This function is used to increment or decrement the current volume for a * sink. -(at)return E_OK on success, E_UNKNOWN on error and E_OUT_OF_RANGE if - * the value is not in the given volume range. +(at)return E_OK on success, E_UNKNOWN on error and E_OUT_OF_RANGE if the + * value is not in the given volume range. */ -void CommandControlDBusProxy::volumeStep(const am_sinkID_t& sinkID, const int16_t& volumeStep_, CommonAPI::CallStatus& callStatus, am_Error_e& error) { +void CommandControlDBusProxy::volumeStep(const am_sinkID_t& sinkID, const int16_t& volStep, CommonAPI::CallStatus& callStatus, am_Error_e& error) { CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<am_sinkID_t, int16_t>, CommonAPI::DBus::DBusSerializableArguments<am_Error_e> >::callMethodWithReply( *this, "volumeStep", "qn", - sinkID, volumeStep_, + sinkID, volStep, callStatus , error); } -std::future<CommonAPI::CallStatus> CommandControlDBusProxy::volumeStepAsync(const am_sinkID_t& sinkID, const int16_t& volumeStep_, VolumeStepAsyncCallback callback) { +std::future<CommonAPI::CallStatus> CommandControlDBusProxy::volumeStepAsync(const am_sinkID_t& sinkID, const int16_t& volStep, VolumeStepAsyncCallback callback) { return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<am_sinkID_t, int16_t>, CommonAPI::DBus::DBusSerializableArguments<am_Error_e> >::callMethodAsync( *this, "volumeStep", "qn", - sinkID, volumeStep_, + sinkID, volStep, std::move(callback)); } /** @@ -384,8 +384,8 @@ std::future<CommonAPI::CallStatus> CommandControlDBusProxy::getListMainSinksAsyn } /** * returns the actual list of Sources -(at)return E_OK on success, - * E_DATABASE_ERROR on error +(at)return E_OK on success, E_DATABASE_ERROR + * on error */ void CommandControlDBusProxy::getListMainSources(CommonAPI::CallStatus& callStatus, am_SourceType_L& listMainSources, am_Error_e& error) { CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<>, @@ -407,8 +407,8 @@ std::future<CommonAPI::CallStatus> CommandControlDBusProxy::getListMainSourcesAs /** * This is used to retrieve all source sound properties related to a source. * Returns a vector of the sound properties and values as pair -(at)return E_OK - * on success, E_DATABASE_ERROR on error +(at)return E_OK on + * success, E_DATABASE_ERROR on error */ void CommandControlDBusProxy::getListMainSinkSoundProperties(const am_sinkID_t& sinkID, CommonAPI::CallStatus& callStatus, am_MainSoundProperty_L& listSoundProperties, am_Error_e& error) { CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<am_sinkID_t>, @@ -644,7 +644,7 @@ std::future<CommonAPI::CallStatus> CommandControlDBusProxy::setMainSourceNotific void CommandControlDBusProxy::getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const { - ownVersionMajor = 1; + ownVersionMajor = 2; ownVersionMinor = 0; } diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusProxy.h b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusProxy.h index 64091a7..4cebe6c 100644 --- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusProxy.h +++ b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusProxy.h @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.genivi.commonapi.core 2.1.6.v20140519. * Used org.franca.core 0.8.11.201401091023. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. @@ -97,11 +97,11 @@ class CommandControlDBusProxy: virtual public CommandControlProxyBase, virtual p /** * This function is used to increment or decrement the current volume for a * sink. - (at)return E_OK on success, E_UNKNOWN on error and E_OUT_OF_RANGE if - * the value is not in the given volume range. + (at)return E_OK on success, E_UNKNOWN on error and E_OUT_OF_RANGE if the + * value is not in the given volume range. */ - virtual void volumeStep(const am_sinkID_t& sinkID, const int16_t& volumeStep_, CommonAPI::CallStatus& callStatus, am_Error_e& error); - virtual std::future<CommonAPI::CallStatus> volumeStepAsync(const am_sinkID_t& sinkID, const int16_t& volumeStep_, VolumeStepAsyncCallback callback); + virtual void volumeStep(const am_sinkID_t& sinkID, const int16_t& volStep, CommonAPI::CallStatus& callStatus, am_Error_e& error); + virtual std::future<CommonAPI::CallStatus> volumeStepAsync(const am_sinkID_t& sinkID, const int16_t& volStep, VolumeStepAsyncCallback callback); /** * sets the mute state of a sink (at)return E_OK on success, E_UNKNOWN on error. @@ -150,16 +150,16 @@ class CommandControlDBusProxy: virtual public CommandControlProxyBase, virtual p virtual std::future<CommonAPI::CallStatus> getListMainSinksAsync(GetListMainSinksAsyncCallback callback); /** * returns the actual list of Sources - (at)return E_OK on success, - * E_DATABASE_ERROR on error + (at)return E_OK on success, E_DATABASE_ERROR + * on error */ virtual void getListMainSources(CommonAPI::CallStatus& callStatus, am_SourceType_L& listMainSources, am_Error_e& error); virtual std::future<CommonAPI::CallStatus> getListMainSourcesAsync(GetListMainSourcesAsyncCallback callback); /** * This is used to retrieve all source sound properties related to a source. * Returns a vector of the sound properties and values as pair - (at)return E_OK - * on success, E_DATABASE_ERROR on error + (at)return E_OK on + * success, E_DATABASE_ERROR on error */ virtual void getListMainSinkSoundProperties(const am_sinkID_t& sinkID, CommonAPI::CallStatus& callStatus, am_MainSoundProperty_L& listSoundProperties, am_Error_e& error); virtual std::future<CommonAPI::CallStatus> getListMainSinkSoundPropertiesAsync(const am_sinkID_t& sinkID, GetListMainSinkSoundPropertiesAsyncCallback callback); diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusStubAdapter.cpp b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusStubAdapter.cpp index db01c28..f8036b2 100644 --- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusStubAdapter.cpp +++ b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusStubAdapter.cpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.genivi.commonapi.core 2.1.6.v20140519. * Used org.franca.core 0.8.11.201401091023. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. @@ -25,7 +25,7 @@ std::shared_ptr<CommonAPI::DBus::DBusStubAdapter> createCommandControlDBusStubAd return std::make_shared<CommandControlDBusStubAdapter>(factory, commonApiAddress, interfaceName, busName, objectPath, dbusProxyConnection, stubBase); } -__attribute__((constructor)) void registerCommandControlDBusStubAdapter(void) { +INITIALIZER(registerCommandControlDBusStubAdapter) { CommonAPI::DBus::DBusFactory::registerAdapterFactoryMethod(CommandControl::getInterfaceId(), &createCommandControlDBusStubAdapter); } @@ -38,6 +38,7 @@ CommandControlDBusStubAdapterInternal::~CommandControlDBusStubAdapterInternal() } void CommandControlDBusStubAdapterInternal::deactivateManagedInstances() { + } const char* CommandControlDBusStubAdapterInternal::getMethodsDBusIntrospectionXmlData() const { @@ -230,12 +231,12 @@ const char* CommandControlDBusStubAdapterInternal::getMethodsDBusIntrospectionXm /** * This function is used to increment or decrement the current volume for a * sink. - (at)return E_OK on success, E_UNKNOWN on error and E_OUT_OF_RANGE if - * the value is not in the given volume range. + (at)return E_OK on success, E_UNKNOWN on error and E_OUT_OF_RANGE if the + * value is not in the given volume range. */ "<method name=\"volumeStep\">\n" "<arg name=\"sinkID\" type=\"q\" direction=\"in\" />\n" - "<arg name=\"volumeStep_\" type=\"n\" direction=\"in\" />\n" + "<arg name=\"volStep\" type=\"n\" direction=\"in\" />\n" "<arg name=\"error\" type=\"i\" direction=\"out\" />\n" "</method>\n" /** @@ -301,8 +302,8 @@ const char* CommandControlDBusStubAdapterInternal::getMethodsDBusIntrospectionXm "</method>\n" /** * returns the actual list of Sources - (at)return E_OK on success, - * E_DATABASE_ERROR on error + (at)return E_OK on success, E_DATABASE_ERROR + * on error */ "<method name=\"getListMainSources\">\n" "<arg name=\"listMainSources\" type=\"a(qs(iq)q)\" direction=\"out\" />\n" @@ -311,8 +312,8 @@ const char* CommandControlDBusStubAdapterInternal::getMethodsDBusIntrospectionXm /** * This is used to retrieve all source sound properties related to a source. * Returns a vector of the sound properties and values as pair - (at)return E_OK - * on success, E_DATABASE_ERROR on error + (at)return E_OK on + * success, E_DATABASE_ERROR on error */ "<method name=\"getListMainSinkSoundProperties\">\n" "<arg name=\"sinkID\" type=\"q\" direction=\"in\" />\n" @@ -412,10 +413,11 @@ const char* CommandControlDBusStubAdapterInternal::getMethodsDBusIntrospectionXm return introspectionData.c_str(); } -static CommonAPI::DBus::DBusGetAttributeStubDispatcher< +CommonAPI::DBus::DBusGetAttributeStubDispatcher< CommandControlStub, CommonAPI::Version - > getCommandControlInterfaceVersionStubDispatcher(&CommandControlStub::getInterfaceVersion, "uu"); + > CommandControlDBusStubAdapterInternal::getCommandControlInterfaceVersionStubDispatcher(&CommandControlStub::getInterfaceVersion, "uu"); + /** @@ -423,52 +425,52 @@ static CommonAPI::DBus::DBusGetAttributeStubDispatcher< (at)return E_OK on success, E_NOT_POSSIBLE on * failure, E_ALREADY_EXISTS if the connection does already exists */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< CommandControlStub, std::tuple<am_sourceID_t, am_sinkID_t>, std::tuple<am_mainConnectionID_t, am_Error_e> - > connectStubDispatcher(&CommandControlStub::connect, "qi"); + > CommandControlDBusStubAdapterInternal::connectStubDispatcher(&CommandControlStub::connect, "qi"); /** * disconnects a mainConnection (at)return E_OK on successes, E_NON_EXISTENT if * the connection does not exist, E_NOT_POSSIBLE on error. */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< CommandControlStub, std::tuple<am_mainConnectionID_t>, std::tuple<am_Error_e> - > disconnectStubDispatcher(&CommandControlStub::disconnect, "i"); + > CommandControlDBusStubAdapterInternal::disconnectStubDispatcher(&CommandControlStub::disconnect, "i"); /** * sets the volume for a sink (at)return E_OK on success, E_UNKOWN on error, * E_OUT_OF_RANGE in case the value is out of range */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< CommandControlStub, std::tuple<am_sinkID_t, am_mainVolume_t>, std::tuple<am_Error_e> - > setVolumeStubDispatcher(&CommandControlStub::setVolume, "i"); + > CommandControlDBusStubAdapterInternal::setVolumeStubDispatcher(&CommandControlStub::setVolume, "i"); /** * This function is used to increment or decrement the current volume for a * sink. -(at)return E_OK on success, E_UNKNOWN on error and E_OUT_OF_RANGE if - * the value is not in the given volume range. +(at)return E_OK on success, E_UNKNOWN on error and E_OUT_OF_RANGE if the + * value is not in the given volume range. */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< CommandControlStub, std::tuple<am_sinkID_t, int16_t>, std::tuple<am_Error_e> - > volumeStepStubDispatcher(&CommandControlStub::volumeStep, "i"); + > CommandControlDBusStubAdapterInternal::volumeStepStubDispatcher(&CommandControlStub::volumeStep, "i"); /** * sets the mute state of a sink (at)return E_OK on success, E_UNKNOWN on error. * If the mute state is already the desired one, the Daemon will return E_OK. */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< CommandControlStub, std::tuple<am_sinkID_t, am_MuteState_e>, std::tuple<am_Error_e> - > setSinkMuteStateStubDispatcher(&CommandControlStub::setSinkMuteState, "i"); + > CommandControlDBusStubAdapterInternal::setSinkMuteStateStubDispatcher(&CommandControlStub::setSinkMuteState, "i"); /** * This method is used to set sound properties, e.g. Equalizer Values. Since the * capabilities of the system can differ, the exact key value pairs can be @@ -476,11 +478,11 @@ static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< (at)return E_OK on success, E_OUT_OF_RANGE if value * exceeds range, E_UNKNOWN in case of an error */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< CommandControlStub, std::tuple<am_sinkID_t, am_MainSoundProperty_s>, std::tuple<am_Error_e> - > setMainSinkSoundPropertyStubDispatcher(&CommandControlStub::setMainSinkSoundProperty, "i"); + > CommandControlDBusStubAdapterInternal::setMainSinkSoundPropertyStubDispatcher(&CommandControlStub::setMainSinkSoundProperty, "i"); /** * This method is used to set sound properties, e.g. Equalizer Values. Since the * capabilities of the system can differ, the exact key value pairs can be @@ -488,153 +490,154 @@ static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< (at)return E_OK on success, E_OUT_OF_RANGE if value * exceeds range, E_UNKNOWN in case of an error */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< CommandControlStub, std::tuple<am_sourceID_t, am_MainSoundProperty_s>, std::tuple<am_Error_e> - > setMainSourceSoundPropertyStubDispatcher(&CommandControlStub::setMainSourceSoundProperty, "i"); + > CommandControlDBusStubAdapterInternal::setMainSourceSoundPropertyStubDispatcher(&CommandControlStub::setMainSourceSoundProperty, "i"); /** * is used to set a specific system property. (at)return E_OK on success, * E_OUT_OF_RANGE if value exceeds range, E_UNKNOWN in case of an error */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< CommandControlStub, std::tuple<am_SystemProperty_s>, std::tuple<am_Error_e> - > setSystemPropertyStubDispatcher(&CommandControlStub::setSystemProperty, "i"); + > CommandControlDBusStubAdapterInternal::setSystemPropertyStubDispatcher(&CommandControlStub::setSystemProperty, "i"); /** * returns the actual list of MainConnections (at)return E_OK on success, * E_DATABASE_ERROR on error */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< CommandControlStub, std::tuple<>, std::tuple<am_MainConnection_L, am_Error_e> - > getListMainConnectionsStubDispatcher(&CommandControlStub::getListMainConnections, "a(qqqni)i"); + > CommandControlDBusStubAdapterInternal::getListMainConnectionsStubDispatcher(&CommandControlStub::getListMainConnections, "a(qqqni)i"); /** * returns the actual list of Sinks (at)return E_OK on success, E_DATABASE_ERROR * on error */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< CommandControlStub, std::tuple<>, std::tuple<am_SinkType_L, am_Error_e> - > getListMainSinksStubDispatcher(&CommandControlStub::getListMainSinks, "a(qs(iq)niq)i"); + > CommandControlDBusStubAdapterInternal::getListMainSinksStubDispatcher(&CommandControlStub::getListMainSinks, "a(qs(iq)niq)i"); /** * returns the actual list of Sources -(at)return E_OK on success, - * E_DATABASE_ERROR on error +(at)return E_OK on success, E_DATABASE_ERROR + * on error */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< CommandControlStub, std::tuple<>, std::tuple<am_SourceType_L, am_Error_e> - > getListMainSourcesStubDispatcher(&CommandControlStub::getListMainSources, "a(qs(iq)q)i"); + > CommandControlDBusStubAdapterInternal::getListMainSourcesStubDispatcher(&CommandControlStub::getListMainSources, "a(qs(iq)q)i"); /** * This is used to retrieve all source sound properties related to a source. * Returns a vector of the sound properties and values as pair -(at)return E_OK - * on success, E_DATABASE_ERROR on error +(at)return E_OK on + * success, E_DATABASE_ERROR on error */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< CommandControlStub, std::tuple<am_sinkID_t>, std::tuple<am_MainSoundProperty_L, am_Error_e> - > getListMainSinkSoundPropertiesStubDispatcher(&CommandControlStub::getListMainSinkSoundProperties, "a(qn)i"); + > CommandControlDBusStubAdapterInternal::getListMainSinkSoundPropertiesStubDispatcher(&CommandControlStub::getListMainSinkSoundProperties, "a(qn)i"); /** * This is used to retrieve all source sound properties related to a * source. (at)return E_OK on success, E_DATABASE_ERROR on error */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< CommandControlStub, std::tuple<am_sourceID_t>, std::tuple<am_MainSoundProperty_L, am_Error_e> - > getListMainSourceSoundPropertiesStubDispatcher(&CommandControlStub::getListMainSourceSoundProperties, "a(qn)i"); + > CommandControlDBusStubAdapterInternal::getListMainSourceSoundPropertiesStubDispatcher(&CommandControlStub::getListMainSourceSoundProperties, "a(qn)i"); /** * This is used to retrieve SourceClass Information of all source classes * (at)return E_OK on success, E_DATABASE_ERROR on error */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< CommandControlStub, std::tuple<>, std::tuple<am_SourceClass_L, am_Error_e> - > getListSourceClassesStubDispatcher(&CommandControlStub::getListSourceClasses, "a(qsa(qn))i"); + > CommandControlDBusStubAdapterInternal::getListSourceClassesStubDispatcher(&CommandControlStub::getListSourceClasses, "a(qsa(qn))i"); /** * This is used to retrieve SinkClass Information of all sink classes (at)return * E_OK on success, E_DATABASE_ERROR on error */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< CommandControlStub, std::tuple<>, std::tuple<am_SinkClass_L, am_Error_e> - > getListSinkClassesStubDispatcher(&CommandControlStub::getListSinkClasses, "a(qsa(qn))i"); + > CommandControlDBusStubAdapterInternal::getListSinkClassesStubDispatcher(&CommandControlStub::getListSinkClasses, "a(qsa(qn))i"); /** * Retrieves a complete list of all systemProperties. (at)return E_OK on success, * E_DATABASE_ERROR on error */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< CommandControlStub, std::tuple<>, std::tuple<am_SystemProperty_L, am_Error_e> - > getListSystemPropertiesStubDispatcher(&CommandControlStub::getListSystemProperties, "a(qn)i"); + > CommandControlDBusStubAdapterInternal::getListSystemPropertiesStubDispatcher(&CommandControlStub::getListSystemProperties, "a(qn)i"); /** * returns the delay in ms that the audiopath for the given mainConnection * has (at)return E_OK on success, E_NOT_POSSIBLE if timing information is not * yet retrieved, E_DATABASE_ERROR on read error on the database */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< CommandControlStub, std::tuple<am_mainConnectionID_t>, std::tuple<am_timeSync_t, am_Error_e> - > getTimingInformationStubDispatcher(&CommandControlStub::getTimingInformation, "ni"); + > CommandControlDBusStubAdapterInternal::getTimingInformationStubDispatcher(&CommandControlStub::getTimingInformation, "ni"); /** * Retrieves the list of MainNotifications for a sink. Does not return the * possible ones. */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< CommandControlStub, std::tuple<am_sinkID_t>, std::tuple<am_NotificationConfiguration_L, am_Error_e> - > getListMainSinkNotificationConfigurationsStubDispatcher(&CommandControlStub::getListMainSinkNotificationConfigurations, "a(qin)i"); + > CommandControlDBusStubAdapterInternal::getListMainSinkNotificationConfigurationsStubDispatcher(&CommandControlStub::getListMainSinkNotificationConfigurations, "a(qin)i"); /** * Retrieves the list of MainNotifications for a source. Does not return the * possible ones. */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< CommandControlStub, std::tuple<am_sourceID_t>, std::tuple<am_NotificationConfiguration_L, am_Error_e> - > getListMainSourceNotificationConfigurationsStubDispatcher(&CommandControlStub::getListMainSourceNotificationConfigurations, "a(qin)i"); + > CommandControlDBusStubAdapterInternal::getListMainSourceNotificationConfigurationsStubDispatcher(&CommandControlStub::getListMainSourceNotificationConfigurations, "a(qin)i"); /** * sets a MainNotificationConfiuration. This can be used to turn on an off * notifications an to change the mode of the configuration. (at)return E_OK on * success, E_NON_EXISTENT if sinkID does not exists, E_DATABASE_ERROR on error */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< CommandControlStub, std::tuple<am_sinkID_t, am_NotificationConfiguration_s>, std::tuple<am_Error_e> - > setMainSinkNotificationConfigurationStubDispatcher(&CommandControlStub::setMainSinkNotificationConfiguration, "i"); + > CommandControlDBusStubAdapterInternal::setMainSinkNotificationConfigurationStubDispatcher(&CommandControlStub::setMainSinkNotificationConfiguration, "i"); /** * sets a MainNotificationConfiuration. This can be used to turn on an off * notifications an to change the mode of the configuration. (at)return E_OK on * success, E_NON_EXISTENT if sourceID does not exists, E_DATABASE_ERROR on error */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< CommandControlStub, std::tuple<am_sourceID_t, am_NotificationConfiguration_s>, std::tuple<am_Error_e> - > setMainSourceNotificationConfigurationStubDispatcher(&CommandControlStub::setMainSourceNotificationConfiguration, "i"); + > CommandControlDBusStubAdapterInternal::setMainSourceNotificationConfigurationStubDispatcher(&CommandControlStub::setMainSourceNotificationConfiguration, "i"); + /** @@ -912,10 +915,14 @@ void CommandControlDBusStubAdapterInternal::fireMainSourceNotificationConfigurat ); } + const CommandControlDBusStubAdapterHelper::StubDispatcherTable& CommandControlDBusStubAdapterInternal::getStubDispatcherTable() { return stubDispatcherTable_; } +const CommonAPI::DBus::StubAttributeTable& CommandControlDBusStubAdapterInternal::getStubAttributeTable() { + return stubAttributeTable_; +} CommandControlDBusStubAdapterInternal::CommandControlDBusStubAdapterInternal( const std::shared_ptr<CommonAPI::DBus::DBusFactory>& factory, @@ -948,32 +955,32 @@ CommandControlDBusStubAdapterInternal::CommandControlDBusStubAdapterInternal( (at)return E_OK on success, E_NOT_POSSIBLE on * failure, E_ALREADY_EXISTS if the connection does already exists */ - { { "connect", "qq" }, &org::genivi::am::connectStubDispatcher }, + { { "connect", "qq" }, &org::genivi::am::CommandControlDBusStubAdapterInternal::connectStubDispatcher }, /** * disconnects a mainConnection (at)return E_OK on successes, E_NON_EXISTENT if * the connection does not exist, E_NOT_POSSIBLE on error. */ - { { "disconnect", "q" }, &org::genivi::am::disconnectStubDispatcher }, + { { "disconnect", "q" }, &org::genivi::am::CommandControlDBusStubAdapterInternal::disconnectStubDispatcher }, /** * sets the volume for a sink (at)return E_OK on success, E_UNKOWN on error, * E_OUT_OF_RANGE in case the value is out of range */ - { { "setVolume", "qn" }, &org::genivi::am::setVolumeStubDispatcher }, + { { "setVolume", "qn" }, &org::genivi::am::CommandControlDBusStubAdapterInternal::setVolumeStubDispatcher }, /** * This function is used to increment or decrement the current volume for a * sink. - (at)return E_OK on success, E_UNKNOWN on error and E_OUT_OF_RANGE if - * the value is not in the given volume range. + (at)return E_OK on success, E_UNKNOWN on error and E_OUT_OF_RANGE if the + * value is not in the given volume range. */ - { { "volumeStep", "qn" }, &org::genivi::am::volumeStepStubDispatcher }, + { { "volumeStep", "qn" }, &org::genivi::am::CommandControlDBusStubAdapterInternal::volumeStepStubDispatcher }, /** * sets the mute state of a sink (at)return E_OK on success, E_UNKNOWN on error. * If the mute state is already the desired one, the Daemon will return E_OK. */ - { { "setSinkMuteState", "qi" }, &org::genivi::am::setSinkMuteStateStubDispatcher }, + { { "setSinkMuteState", "qi" }, &org::genivi::am::CommandControlDBusStubAdapterInternal::setSinkMuteStateStubDispatcher }, /** * This method is used to set sound properties, e.g. Equalizer Values. Since the * capabilities of the system can differ, the exact key value pairs can be @@ -981,7 +988,7 @@ CommandControlDBusStubAdapterInternal::CommandControlDBusStubAdapterInternal( (at)return E_OK on success, E_OUT_OF_RANGE if value * exceeds range, E_UNKNOWN in case of an error */ - { { "setMainSinkSoundProperty", "q(qn)" }, &org::genivi::am::setMainSinkSoundPropertyStubDispatcher }, + { { "setMainSinkSoundProperty", "q(qn)" }, &org::genivi::am::CommandControlDBusStubAdapterInternal::setMainSinkSoundPropertyStubDispatcher }, /** * This method is used to set sound properties, e.g. Equalizer Values. Since the * capabilities of the system can differ, the exact key value pairs can be @@ -989,96 +996,101 @@ CommandControlDBusStubAdapterInternal::CommandControlDBusStubAdapterInternal( (at)return E_OK on success, E_OUT_OF_RANGE if value * exceeds range, E_UNKNOWN in case of an error */ - { { "setMainSourceSoundProperty", "q(qn)" }, &org::genivi::am::setMainSourceSoundPropertyStubDispatcher }, + { { "setMainSourceSoundProperty", "q(qn)" }, &org::genivi::am::CommandControlDBusStubAdapterInternal::setMainSourceSoundPropertyStubDispatcher }, /** * is used to set a specific system property. (at)return E_OK on success, * E_OUT_OF_RANGE if value exceeds range, E_UNKNOWN in case of an error */ - { { "setSystemProperty", "(qn)" }, &org::genivi::am::setSystemPropertyStubDispatcher }, + { { "setSystemProperty", "(qn)" }, &org::genivi::am::CommandControlDBusStubAdapterInternal::setSystemPropertyStubDispatcher }, /** * returns the actual list of MainConnections (at)return E_OK on success, * E_DATABASE_ERROR on error */ - { { "getListMainConnections", "" }, &org::genivi::am::getListMainConnectionsStubDispatcher }, + { { "getListMainConnections", "" }, &org::genivi::am::CommandControlDBusStubAdapterInternal::getListMainConnectionsStubDispatcher }, /** * returns the actual list of Sinks (at)return E_OK on success, E_DATABASE_ERROR * on error */ - { { "getListMainSinks", "" }, &org::genivi::am::getListMainSinksStubDispatcher }, + { { "getListMainSinks", "" }, &org::genivi::am::CommandControlDBusStubAdapterInternal::getListMainSinksStubDispatcher }, /** * returns the actual list of Sources - (at)return E_OK on success, - * E_DATABASE_ERROR on error + (at)return E_OK on success, E_DATABASE_ERROR + * on error */ - { { "getListMainSources", "" }, &org::genivi::am::getListMainSourcesStubDispatcher }, + { { "getListMainSources", "" }, &org::genivi::am::CommandControlDBusStubAdapterInternal::getListMainSourcesStubDispatcher }, /** * This is used to retrieve all source sound properties related to a source. * Returns a vector of the sound properties and values as pair - (at)return E_OK - * on success, E_DATABASE_ERROR on error + (at)return E_OK on + * success, E_DATABASE_ERROR on error */ - { { "getListMainSinkSoundProperties", "q" }, &org::genivi::am::getListMainSinkSoundPropertiesStubDispatcher }, + { { "getListMainSinkSoundProperties", "q" }, &org::genivi::am::CommandControlDBusStubAdapterInternal::getListMainSinkSoundPropertiesStubDispatcher }, /** * This is used to retrieve all source sound properties related to a * source. (at)return E_OK on success, E_DATABASE_ERROR on error */ - { { "getListMainSourceSoundProperties", "q" }, &org::genivi::am::getListMainSourceSoundPropertiesStubDispatcher }, + { { "getListMainSourceSoundProperties", "q" }, &org::genivi::am::CommandControlDBusStubAdapterInternal::getListMainSourceSoundPropertiesStubDispatcher }, /** * This is used to retrieve SourceClass Information of all source classes * (at)return E_OK on success, E_DATABASE_ERROR on error */ - { { "getListSourceClasses", "" }, &org::genivi::am::getListSourceClassesStubDispatcher }, + { { "getListSourceClasses", "" }, &org::genivi::am::CommandControlDBusStubAdapterInternal::getListSourceClassesStubDispatcher }, /** * This is used to retrieve SinkClass Information of all sink classes (at)return * E_OK on success, E_DATABASE_ERROR on error */ - { { "getListSinkClasses", "" }, &org::genivi::am::getListSinkClassesStubDispatcher }, + { { "getListSinkClasses", "" }, &org::genivi::am::CommandControlDBusStubAdapterInternal::getListSinkClassesStubDispatcher }, /** * Retrieves a complete list of all systemProperties. (at)return E_OK on success, * E_DATABASE_ERROR on error */ - { { "getListSystemProperties", "" }, &org::genivi::am::getListSystemPropertiesStubDispatcher }, + { { "getListSystemProperties", "" }, &org::genivi::am::CommandControlDBusStubAdapterInternal::getListSystemPropertiesStubDispatcher }, /** * returns the delay in ms that the audiopath for the given mainConnection * has (at)return E_OK on success, E_NOT_POSSIBLE if timing information is not * yet retrieved, E_DATABASE_ERROR on read error on the database */ - { { "getTimingInformation", "q" }, &org::genivi::am::getTimingInformationStubDispatcher }, + { { "getTimingInformation", "q" }, &org::genivi::am::CommandControlDBusStubAdapterInternal::getTimingInformationStubDispatcher }, /** * Retrieves the list of MainNotifications for a sink. Does not return the * possible ones. */ - { { "getListMainSinkNotificationConfigurations", "q" }, &org::genivi::am::getListMainSinkNotificationConfigurationsStubDispatcher }, + { { "getListMainSinkNotificationConfigurations", "q" }, &org::genivi::am::CommandControlDBusStubAdapterInternal::getListMainSinkNotificationConfigurationsStubDispatcher }, /** * Retrieves the list of MainNotifications for a source. Does not return the * possible ones. */ - { { "getListMainSourceNotificationConfigurations", "q" }, &org::genivi::am::getListMainSourceNotificationConfigurationsStubDispatcher }, + { { "getListMainSourceNotificationConfigurations", "q" }, &org::genivi::am::CommandControlDBusStubAdapterInternal::getListMainSourceNotificationConfigurationsStubDispatcher }, /** * sets a MainNotificationConfiuration. This can be used to turn on an off * notifications an to change the mode of the configuration. (at)return E_OK on * success, E_NON_EXISTENT if sinkID does not exists, E_DATABASE_ERROR on error */ - { { "setMainSinkNotificationConfiguration", "q(qin)" }, &org::genivi::am::setMainSinkNotificationConfigurationStubDispatcher }, + { { "setMainSinkNotificationConfiguration", "q(qin)" }, &org::genivi::am::CommandControlDBusStubAdapterInternal::setMainSinkNotificationConfigurationStubDispatcher }, /** * sets a MainNotificationConfiuration. This can be used to turn on an off * notifications an to change the mode of the configuration. (at)return E_OK on * success, E_NON_EXISTENT if sourceID does not exists, E_DATABASE_ERROR on error */ - { { "setMainSourceNotificationConfiguration", "q(qin)" }, &org::genivi::am::setMainSourceNotificationConfigurationStubDispatcher } - }) { + { { "setMainSourceNotificationConfiguration", "q(qin)" }, &org::genivi::am::CommandControlDBusStubAdapterInternal::setMainSourceNotificationConfigurationStubDispatcher } + }), + stubAttributeTable_() { + + stubDispatcherTable_.insert({ { "getInterfaceVersion", "" }, &org::genivi::am::CommandControlDBusStubAdapterInternal::getCommandControlInterfaceVersionStubDispatcher }); +} - stubDispatcherTable_.insert({ { "getInterfaceVersion", "" }, &org::genivi::am::getCommandControlInterfaceVersionStubDispatcher }); +const bool CommandControlDBusStubAdapterInternal::hasFreedesktopProperties() { + return false; } } // namespace am diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusStubAdapter.h b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusStubAdapter.h index 8ef3355..46a99eb 100644 --- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusStubAdapter.h +++ b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusStubAdapter.h @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.genivi.commonapi.core 2.1.6.v20140519. * Used org.franca.core 0.8.11.201401091023. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. @@ -37,7 +37,7 @@ namespace am { typedef CommonAPI::DBus::DBusStubAdapterHelper<CommandControlStub> CommandControlDBusStubAdapterHelper; -class CommandControlDBusStubAdapterInternal: public CommandControlStubAdapter, public CommandControlDBusStubAdapterHelper { +class CommandControlDBusStubAdapterInternal: public virtual CommandControlStubAdapter, public CommandControlDBusStubAdapterHelper { public: CommandControlDBusStubAdapterInternal( const std::shared_ptr<CommonAPI::DBus::DBusFactory>& factory, @@ -50,6 +50,8 @@ class CommandControlDBusStubAdapterInternal: public CommandControlStubAdapter, p ~CommandControlDBusStubAdapterInternal(); + virtual const bool hasFreedesktopProperties(); + /** * Callback that is called when the number of connections change @@ -146,15 +148,245 @@ class CommandControlDBusStubAdapterInternal: public CommandControlStubAdapter, p const CommandControlDBusStubAdapterHelper::StubDispatcherTable& getStubDispatcherTable(); + const CommonAPI::DBus::StubAttributeTable& getStubAttributeTable(); void deactivateManagedInstances(); +static CommonAPI::DBus::DBusGetAttributeStubDispatcher< + CommandControlStub, + CommonAPI::Version + > getCommandControlInterfaceVersionStubDispatcher; + + + +/** + * connects a source to sink +(at)return E_OK on success, E_NOT_POSSIBLE on + * failure, E_ALREADY_EXISTS if the connection does already exists + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + CommandControlStub, + std::tuple<am_sourceID_t, am_sinkID_t>, + std::tuple<am_mainConnectionID_t, am_Error_e> + > connectStubDispatcher; +/** + * disconnects a mainConnection +(at)return E_OK on successes, E_NON_EXISTENT if + * the connection does not exist, E_NOT_POSSIBLE on error. + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + CommandControlStub, + std::tuple<am_mainConnectionID_t>, + std::tuple<am_Error_e> + > disconnectStubDispatcher; +/** + * sets the volume for a sink +(at)return E_OK on success, E_UNKOWN on error, + * E_OUT_OF_RANGE in case the value is out of range + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + CommandControlStub, + std::tuple<am_sinkID_t, am_mainVolume_t>, + std::tuple<am_Error_e> + > setVolumeStubDispatcher; +/** + * This function is used to increment or decrement the current volume for a + * sink. +(at)return E_OK on success, E_UNKNOWN on error and E_OUT_OF_RANGE if the + * value is not in the given volume range. + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + CommandControlStub, + std::tuple<am_sinkID_t, int16_t>, + std::tuple<am_Error_e> + > volumeStepStubDispatcher; +/** + * sets the mute state of a sink +(at)return E_OK on success, E_UNKNOWN on error. + * If the mute state is already the desired one, the Daemon will return E_OK. + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + CommandControlStub, + std::tuple<am_sinkID_t, am_MuteState_e>, + std::tuple<am_Error_e> + > setSinkMuteStateStubDispatcher; +/** + * This method is used to set sound properties, e.g. Equalizer Values. Since the + * capabilities of the system can differ, the exact key value pairs can be + * extended in each product +(at)return E_OK on success, E_OUT_OF_RANGE if value + * exceeds range, E_UNKNOWN in case of an error + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + CommandControlStub, + std::tuple<am_sinkID_t, am_MainSoundProperty_s>, + std::tuple<am_Error_e> + > setMainSinkSoundPropertyStubDispatcher; +/** + * This method is used to set sound properties, e.g. Equalizer Values. Since the + * capabilities of the system can differ, the exact key value pairs can be + * extended in each product +(at)return E_OK on success, E_OUT_OF_RANGE if value + * exceeds range, E_UNKNOWN in case of an error + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + CommandControlStub, + std::tuple<am_sourceID_t, am_MainSoundProperty_s>, + std::tuple<am_Error_e> + > setMainSourceSoundPropertyStubDispatcher; +/** + * is used to set a specific system property. +(at)return E_OK on success, + * E_OUT_OF_RANGE if value exceeds range, E_UNKNOWN in case of an error + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + CommandControlStub, + std::tuple<am_SystemProperty_s>, + std::tuple<am_Error_e> + > setSystemPropertyStubDispatcher; +/** + * returns the actual list of MainConnections +(at)return E_OK on success, + * E_DATABASE_ERROR on error + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + CommandControlStub, + std::tuple<>, + std::tuple<am_MainConnection_L, am_Error_e> + > getListMainConnectionsStubDispatcher; +/** + * returns the actual list of Sinks +(at)return E_OK on success, E_DATABASE_ERROR + * on error + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + CommandControlStub, + std::tuple<>, + std::tuple<am_SinkType_L, am_Error_e> + > getListMainSinksStubDispatcher; +/** + * returns the actual list of Sources +(at)return E_OK on success, E_DATABASE_ERROR + * on error + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + CommandControlStub, + std::tuple<>, + std::tuple<am_SourceType_L, am_Error_e> + > getListMainSourcesStubDispatcher; +/** + * This is used to retrieve all source sound properties related to a source. + * Returns a vector of the sound properties and values as pair +(at)return E_OK on + * success, E_DATABASE_ERROR on error + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + CommandControlStub, + std::tuple<am_sinkID_t>, + std::tuple<am_MainSoundProperty_L, am_Error_e> + > getListMainSinkSoundPropertiesStubDispatcher; +/** + * This is used to retrieve all source sound properties related to a + * source. +(at)return E_OK on success, E_DATABASE_ERROR on error + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + CommandControlStub, + std::tuple<am_sourceID_t>, + std::tuple<am_MainSoundProperty_L, am_Error_e> + > getListMainSourceSoundPropertiesStubDispatcher; +/** + * This is used to retrieve SourceClass Information of all source classes + * +(at)return E_OK on success, E_DATABASE_ERROR on error + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + CommandControlStub, + std::tuple<>, + std::tuple<am_SourceClass_L, am_Error_e> + > getListSourceClassesStubDispatcher; +/** + * This is used to retrieve SinkClass Information of all sink classes +(at)return + * E_OK on success, E_DATABASE_ERROR on error + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + CommandControlStub, + std::tuple<>, + std::tuple<am_SinkClass_L, am_Error_e> + > getListSinkClassesStubDispatcher; +/** + * Retrieves a complete list of all systemProperties. +(at)return E_OK on success, + * E_DATABASE_ERROR on error + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + CommandControlStub, + std::tuple<>, + std::tuple<am_SystemProperty_L, am_Error_e> + > getListSystemPropertiesStubDispatcher; +/** + * returns the delay in ms that the audiopath for the given mainConnection + * has +(at)return E_OK on success, E_NOT_POSSIBLE if timing information is not + * yet retrieved, E_DATABASE_ERROR on read error on the database + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + CommandControlStub, + std::tuple<am_mainConnectionID_t>, + std::tuple<am_timeSync_t, am_Error_e> + > getTimingInformationStubDispatcher; +/** + * Retrieves the list of MainNotifications for a sink. Does not return the + * possible ones. + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + CommandControlStub, + std::tuple<am_sinkID_t>, + std::tuple<am_NotificationConfiguration_L, am_Error_e> + > getListMainSinkNotificationConfigurationsStubDispatcher; +/** + * Retrieves the list of MainNotifications for a source. Does not return the + * possible ones. + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + CommandControlStub, + std::tuple<am_sourceID_t>, + std::tuple<am_NotificationConfiguration_L, am_Error_e> + > getListMainSourceNotificationConfigurationsStubDispatcher; +/** + * sets a MainNotificationConfiuration. This can be used to turn on an off + * notifications an to change the mode of the configuration. +(at)return E_OK on + * success, E_NON_EXISTENT if sinkID does not exists, E_DATABASE_ERROR on error + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + CommandControlStub, + std::tuple<am_sinkID_t, am_NotificationConfiguration_s>, + std::tuple<am_Error_e> + > setMainSinkNotificationConfigurationStubDispatcher; +/** + * sets a MainNotificationConfiuration. This can be used to turn on an off + * notifications an to change the mode of the configuration. +(at)return E_OK on + * success, E_NON_EXISTENT if sourceID does not exists, E_DATABASE_ERROR on error + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + CommandControlStub, + std::tuple<am_sourceID_t, am_NotificationConfiguration_s>, + std::tuple<am_Error_e> + > setMainSourceNotificationConfigurationStubDispatcher; + + + + protected: virtual const char* getMethodsDBusIntrospectionXmlData() const; - - private: + + private: CommandControlDBusStubAdapterHelper::StubDispatcherTable stubDispatcherTable_; + CommonAPI::DBus::StubAttributeTable stubAttributeTable_; }; class CommandControlDBusStubAdapter: public CommandControlDBusStubAdapterInternal, public std::enable_shared_from_this<CommandControlDBusStubAdapter> { diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlProxy.h b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlProxy.h index 656d3f7..5e98b7b 100644 --- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlProxy.h +++ b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlProxy.h @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.genivi.commonapi.core 2.1.6.v20140519. * Used org.franca.core 0.8.11.201401091023. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. @@ -329,8 +329,8 @@ public: /** * This function is used to increment or decrement the current volume for a * sink. - (at)return E_OK on success, E_UNKNOWN on error and E_OUT_OF_RANGE if - * the value is not in the given volume range. + (at)return E_OK on success, E_UNKNOWN on error and E_OUT_OF_RANGE if the + * value is not in the given volume range. * * Calls volumeStep with synchronous semantics. * @@ -340,7 +340,7 @@ public: * "SUCCESS" or which type of error has occurred. In case of an error, ONLY the CallStatus * will be set. */ - virtual void volumeStep(const am_sinkID_t& sinkID, const int16_t& volumeStep_, CommonAPI::CallStatus& callStatus, am_Error_e& error); + virtual void volumeStep(const am_sinkID_t& sinkID, const int16_t& volStep, CommonAPI::CallStatus& callStatus, am_Error_e& error); /** * Calls volumeStep with asynchronous semantics. * @@ -351,7 +351,7 @@ public: * The std::future returned by this method will be fulfilled at arrival of the reply. * It will provide the same value for CallStatus as will be handed to the callback. */ - virtual std::future<CommonAPI::CallStatus> volumeStepAsync(const am_sinkID_t& sinkID, const int16_t& volumeStep_, VolumeStepAsyncCallback callback); + virtual std::future<CommonAPI::CallStatus> volumeStepAsync(const am_sinkID_t& sinkID, const int16_t& volStep, VolumeStepAsyncCallback callback); /** * sets the mute state of a sink (at)return E_OK on success, E_UNKNOWN on error. @@ -506,8 +506,8 @@ public: virtual std::future<CommonAPI::CallStatus> getListMainSinksAsync(GetListMainSinksAsyncCallback callback); /** * returns the actual list of Sources - (at)return E_OK on success, - * E_DATABASE_ERROR on error + (at)return E_OK on success, E_DATABASE_ERROR + * on error * * Calls getListMainSources with synchronous semantics. * @@ -531,8 +531,8 @@ public: /** * This is used to retrieve all source sound properties related to a source. * Returns a vector of the sound properties and values as pair - (at)return E_OK - * on success, E_DATABASE_ERROR on error + (at)return E_OK on + * success, E_DATABASE_ERROR on error * * Calls getListMainSinkSoundProperties with synchronous semantics. * @@ -825,14 +825,20 @@ public: std::shared_ptr<CommandControlProxyBase> delegate_; }; +#ifdef WIN32 + typedef CommandControlProxy<CommonAPI::WINDummyAttributeExtension<CommonAPI::WINDummyAttribute>> CommandControlProxyDefault; +#else + typedef CommandControlProxy<> CommandControlProxyDefault; +#endif + // // CommandControlProxy Implementation // template <typename ... _AttributeExtensions> CommandControlProxy<_AttributeExtensions...>::CommandControlProxy(std::shared_ptr<CommonAPI::Proxy> delegate): - delegate_(std::dynamic_pointer_cast<CommandControlProxyBase>(delegate)), - _AttributeExtensions(*(std::dynamic_pointer_cast<CommandControlProxyBase>(delegate)))... { + _AttributeExtensions(*(std::dynamic_pointer_cast<CommandControlProxyBase>(delegate)))..., + delegate_(std::dynamic_pointer_cast<CommandControlProxyBase>(delegate)) { } template <typename ... _AttributeExtensions> @@ -884,17 +890,17 @@ std::future<CommonAPI::CallStatus> CommandControlProxy<_AttributeExtensions...>: /** * This function is used to increment or decrement the current volume for a * sink. -(at)return E_OK on success, E_UNKNOWN on error and E_OUT_OF_RANGE if - * the value is not in the given volume range. +(at)return E_OK on success, E_UNKNOWN on error and E_OUT_OF_RANGE if the + * value is not in the given volume range. */ template <typename ... _AttributeExtensions> -void CommandControlProxy<_AttributeExtensions...>::volumeStep(const am_sinkID_t& sinkID, const int16_t& volumeStep_, CommonAPI::CallStatus& callStatus, am_Error_e& error) { - delegate_->volumeStep(sinkID, volumeStep_, callStatus, error); +void CommandControlProxy<_AttributeExtensions...>::volumeStep(const am_sinkID_t& sinkID, const int16_t& volStep, CommonAPI::CallStatus& callStatus, am_Error_e& error) { + delegate_->volumeStep(sinkID, volStep, callStatus, error); } template <typename ... _AttributeExtensions> -std::future<CommonAPI::CallStatus> CommandControlProxy<_AttributeExtensions...>::volumeStepAsync(const am_sinkID_t& sinkID, const int16_t& volumeStep_, VolumeStepAsyncCallback callback) { - return delegate_->volumeStepAsync(sinkID, volumeStep_, callback); +std::future<CommonAPI::CallStatus> CommandControlProxy<_AttributeExtensions...>::volumeStepAsync(const am_sinkID_t& sinkID, const int16_t& volStep, VolumeStepAsyncCallback callback) { + return delegate_->volumeStepAsync(sinkID, volStep, callback); } /** * sets the mute state of a sink @@ -986,8 +992,8 @@ std::future<CommonAPI::CallStatus> CommandControlProxy<_AttributeExtensions...>: } /** * returns the actual list of Sources -(at)return E_OK on success, - * E_DATABASE_ERROR on error +(at)return E_OK on success, E_DATABASE_ERROR + * on error */ template <typename ... _AttributeExtensions> void CommandControlProxy<_AttributeExtensions...>::getListMainSources(CommonAPI::CallStatus& callStatus, am_SourceType_L& listMainSources, am_Error_e& error) { @@ -1001,8 +1007,8 @@ std::future<CommonAPI::CallStatus> CommandControlProxy<_AttributeExtensions...>: /** * This is used to retrieve all source sound properties related to a source. * Returns a vector of the sound properties and values as pair -(at)return E_OK - * on success, E_DATABASE_ERROR on error +(at)return E_OK on + * success, E_DATABASE_ERROR on error */ template <typename ... _AttributeExtensions> void CommandControlProxy<_AttributeExtensions...>::getListMainSinkSoundProperties(const am_sinkID_t& sinkID, CommonAPI::CallStatus& callStatus, am_MainSoundProperty_L& listSoundProperties, am_Error_e& error) { diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlProxyBase.h b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlProxyBase.h index 377547a..9151ef0 100644 --- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlProxyBase.h +++ b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlProxyBase.h @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.genivi.commonapi.core 2.1.6.v20140519. * Used org.franca.core 0.8.11.201401091023. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. @@ -211,11 +211,11 @@ class CommandControlProxyBase: virtual public CommonAPI::Proxy { /** * This function is used to increment or decrement the current volume for a * sink. - (at)return E_OK on success, E_UNKNOWN on error and E_OUT_OF_RANGE if - * the value is not in the given volume range. + (at)return E_OK on success, E_UNKNOWN on error and E_OUT_OF_RANGE if the + * value is not in the given volume range. */ - virtual void volumeStep(const am_sinkID_t& sinkID, const int16_t& volumeStep_, CommonAPI::CallStatus& callStatus, am_Error_e& error) = 0; - virtual std::future<CommonAPI::CallStatus> volumeStepAsync(const am_sinkID_t& sinkID, const int16_t& volumeStep_, VolumeStepAsyncCallback callback) = 0; + virtual void volumeStep(const am_sinkID_t& sinkID, const int16_t& volStep, CommonAPI::CallStatus& callStatus, am_Error_e& error) = 0; + virtual std::future<CommonAPI::CallStatus> volumeStepAsync(const am_sinkID_t& sinkID, const int16_t& volStep, VolumeStepAsyncCallback callback) = 0; /** * sets the mute state of a sink (at)return E_OK on success, E_UNKNOWN on error. @@ -264,16 +264,16 @@ class CommandControlProxyBase: virtual public CommonAPI::Proxy { virtual std::future<CommonAPI::CallStatus> getListMainSinksAsync(GetListMainSinksAsyncCallback callback) = 0; /** * returns the actual list of Sources - (at)return E_OK on success, - * E_DATABASE_ERROR on error + (at)return E_OK on success, E_DATABASE_ERROR + * on error */ virtual void getListMainSources(CommonAPI::CallStatus& callStatus, am_SourceType_L& listMainSources, am_Error_e& error) = 0; virtual std::future<CommonAPI::CallStatus> getListMainSourcesAsync(GetListMainSourcesAsyncCallback callback) = 0; /** * This is used to retrieve all source sound properties related to a source. * Returns a vector of the sound properties and values as pair - (at)return E_OK - * on success, E_DATABASE_ERROR on error + (at)return E_OK on + * success, E_DATABASE_ERROR on error */ virtual void getListMainSinkSoundProperties(const am_sinkID_t& sinkID, CommonAPI::CallStatus& callStatus, am_MainSoundProperty_L& listSoundProperties, am_Error_e& error) = 0; virtual std::future<CommonAPI::CallStatus> getListMainSinkSoundPropertiesAsync(const am_sinkID_t& sinkID, GetListMainSinkSoundPropertiesAsyncCallback callback) = 0; diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStub.h b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStub.h index 6e8de18..414addd 100644 --- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStub.h +++ b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStub.h @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.genivi.commonapi.core 2.1.6.v20140519. * Used org.franca.core 0.8.11.201401091023. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. @@ -204,7 +204,7 @@ class CommandControlStubRemoteEvent { * This class and the one above are the ones an application developer needs to have * a look at if he wants to implement a service. */ -class CommandControlStub : public virtual CommonAPI::Stub<CommandControlStubAdapter, CommandControlStubRemoteEvent> { +class CommandControlStub: public virtual CommonAPI::Stub<CommandControlStubAdapter, CommandControlStubRemoteEvent> { public: virtual ~CommandControlStub() { } virtual const CommonAPI::Version& getInterfaceVersion(std::shared_ptr<CommonAPI::ClientId> clientId) = 0; @@ -234,11 +234,11 @@ public: /** * This function is used to increment or decrement the current volume for a * sink. - (at)return E_OK on success, E_UNKNOWN on error and E_OUT_OF_RANGE if - * the value is not in the given volume range. + (at)return E_OK on success, E_UNKNOWN on error and E_OUT_OF_RANGE if the + * value is not in the given volume range. */ /// This is the method that will be called on remote calls on the method volumeStep. - virtual void volumeStep(const std::shared_ptr<CommonAPI::ClientId> clientId, am_sinkID_t sinkID, int16_t volumeStep_, am_Error_e& error) = 0; + virtual void volumeStep(const std::shared_ptr<CommonAPI::ClientId> clientId, am_sinkID_t sinkID, int16_t volStep, am_Error_e& error) = 0; /** * sets the mute state of a sink (at)return E_OK on success, E_UNKNOWN on error. @@ -287,16 +287,16 @@ public: virtual void getListMainSinks(const std::shared_ptr<CommonAPI::ClientId> clientId, am_SinkType_L& listMainSinks, am_Error_e& error) = 0; /** * returns the actual list of Sources - (at)return E_OK on success, - * E_DATABASE_ERROR on error + (at)return E_OK on success, E_DATABASE_ERROR + * on error */ /// This is the method that will be called on remote calls on the method getListMainSources. virtual void getListMainSources(const std::shared_ptr<CommonAPI::ClientId> clientId, am_SourceType_L& listMainSources, am_Error_e& error) = 0; /** * This is used to retrieve all source sound properties related to a source. * Returns a vector of the sound properties and values as pair - (at)return E_OK - * on success, E_DATABASE_ERROR on error + (at)return E_OK on + * success, E_DATABASE_ERROR on error */ /// This is the method that will be called on remote calls on the method getListMainSinkSoundProperties. virtual void getListMainSinkSoundProperties(const std::shared_ptr<CommonAPI::ClientId> clientId, am_sinkID_t sinkID, am_MainSoundProperty_L& listSoundProperties, am_Error_e& error) = 0; @@ -483,6 +483,8 @@ public: using CommonAPI::Stub<CommandControlStubAdapter, CommandControlStubRemoteEvent>::initStubAdapter; typedef CommonAPI::Stub<CommandControlStubAdapter, CommandControlStubRemoteEvent>::StubAdapterType StubAdapterType; typedef CommonAPI::Stub<CommandControlStubAdapter, CommandControlStubRemoteEvent>::RemoteEventHandlerType RemoteEventHandlerType; + typedef CommandControlStubRemoteEvent RemoteEventType; + typedef CommandControl StubInterface; }; } // namespace am diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStubDefault.cpp b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStubDefault.cpp index f23f2da..c1e03aa 100644 --- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStubDefault.cpp +++ b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStubDefault.cpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.genivi.commonapi.core 2.1.6.v20140519. * Used org.franca.core 0.8.11.201401091023. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. @@ -70,14 +70,14 @@ void CommandControlStubDefault::setVolume(am_sinkID_t sinkID, am_mainVolume_t vo /** * This function is used to increment or decrement the current volume for a * sink. -(at)return E_OK on success, E_UNKNOWN on error and E_OUT_OF_RANGE if - * the value is not in the given volume range. +(at)return E_OK on success, E_UNKNOWN on error and E_OUT_OF_RANGE if the + * value is not in the given volume range. */ -void CommandControlStubDefault::volumeStep(const std::shared_ptr<CommonAPI::ClientId> clientId, am_sinkID_t sinkID, int16_t volumeStep_, am_Error_e& error) { +void CommandControlStubDefault::volumeStep(const std::shared_ptr<CommonAPI::ClientId> clientId, am_sinkID_t sinkID, int16_t volStep, am_Error_e& error) { // Call old style methods in default - volumeStep(sinkID, volumeStep_, error); + volumeStep(sinkID, volStep, error); } -void CommandControlStubDefault::volumeStep(am_sinkID_t sinkID, int16_t volumeStep_, am_Error_e& error) { +void CommandControlStubDefault::volumeStep(am_sinkID_t sinkID, int16_t volStep, am_Error_e& error) { // No operation in default } @@ -165,8 +165,8 @@ void CommandControlStubDefault::getListMainSinks(am_SinkType_L& listMainSinks, a /** * returns the actual list of Sources -(at)return E_OK on success, - * E_DATABASE_ERROR on error +(at)return E_OK on success, E_DATABASE_ERROR + * on error */ void CommandControlStubDefault::getListMainSources(const std::shared_ptr<CommonAPI::ClientId> clientId, am_SourceType_L& listMainSources, am_Error_e& error) { // Call old style methods in default @@ -179,8 +179,8 @@ void CommandControlStubDefault::getListMainSources(am_SourceType_L& listMainSour /** * This is used to retrieve all source sound properties related to a source. * Returns a vector of the sound properties and values as pair -(at)return E_OK - * on success, E_DATABASE_ERROR on error +(at)return E_OK on + * success, E_DATABASE_ERROR on error */ void CommandControlStubDefault::getListMainSinkSoundProperties(const std::shared_ptr<CommonAPI::ClientId> clientId, am_sinkID_t sinkID, am_MainSoundProperty_L& listSoundProperties, am_Error_e& error) { // Call old style methods in default diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStubDefault.h b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStubDefault.h index 2bfe6ba..7f58dbf 100644 --- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStubDefault.h +++ b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStubDefault.h @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.genivi.commonapi.core 2.1.6.v20140519. * Used org.franca.core 0.8.11.201401091023. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. @@ -72,11 +72,11 @@ public: /** * This function is used to increment or decrement the current volume for a * sink. - (at)return E_OK on success, E_UNKNOWN on error and E_OUT_OF_RANGE if - * the value is not in the given volume range. + (at)return E_OK on success, E_UNKNOWN on error and E_OUT_OF_RANGE if the + * value is not in the given volume range. */ - virtual void volumeStep(const std::shared_ptr<CommonAPI::ClientId> clientId, am_sinkID_t sinkID, int16_t volumeStep_, am_Error_e& error); - virtual void volumeStep(am_sinkID_t sinkID, int16_t volumeStep_, am_Error_e& error); + virtual void volumeStep(const std::shared_ptr<CommonAPI::ClientId> clientId, am_sinkID_t sinkID, int16_t volStep, am_Error_e& error); + virtual void volumeStep(am_sinkID_t sinkID, int16_t volStep, am_Error_e& error); /** * sets the mute state of a sink @@ -132,8 +132,8 @@ public: /** * returns the actual list of Sources - (at)return E_OK on success, - * E_DATABASE_ERROR on error + (at)return E_OK on success, E_DATABASE_ERROR + * on error */ virtual void getListMainSources(const std::shared_ptr<CommonAPI::ClientId> clientId, am_SourceType_L& listMainSources, am_Error_e& error); virtual void getListMainSources(am_SourceType_L& listMainSources, am_Error_e& error); @@ -141,8 +141,8 @@ public: /** * This is used to retrieve all source sound properties related to a source. * Returns a vector of the sound properties and values as pair - (at)return E_OK - * on success, E_DATABASE_ERROR on error + (at)return E_OK on + * success, E_DATABASE_ERROR on error */ virtual void getListMainSinkSoundProperties(const std::shared_ptr<CommonAPI::ClientId> clientId, am_sinkID_t sinkID, am_MainSoundProperty_L& listSoundProperties, am_Error_e& error); virtual void getListMainSinkSoundProperties(am_sinkID_t sinkID, am_MainSoundProperty_L& listSoundProperties, am_Error_e& error); @@ -316,8 +316,7 @@ public: protected: -private: - class RemoteEventHandler: public CommandControlStubRemoteEvent { + class RemoteEventHandler: public virtual CommandControlStubRemoteEvent { public: RemoteEventHandler(CommandControlStubDefault* defaultStub); @@ -325,8 +324,8 @@ private: private: CommandControlStubDefault* defaultStub_; }; - - RemoteEventHandler remoteEventHandler_; +private: + CommandControlStubDefault::RemoteEventHandler remoteEventHandler_; CommonAPI::Version interfaceVersion_; diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am.cpp b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am.cpp index 161a7b7..7170981 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am.cpp +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am.cpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.genivi.commonapi.core 2.1.6.v20140519. * Used org.franca.core 0.8.11.201401091023. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am.h index 8996092..ce9ea60 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am.h +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am.h @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.genivi.commonapi.core 2.1.6.v20140519. * Used org.franca.core 0.8.11.201401091023. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. @@ -714,15 +714,15 @@ namespace am { am_NotificationStatus_e status; /** * This gives additional information to the notification status. - Relation - * between notification status and the value: - NS_PERIODIC - the period in - * ms - NS_MINIMUM - the minimum value that triggers the notification - NS_MAXIMUM - * - the maximum value that triggers the notifcation - NS_CHANGE - the resolution - * of the change value + Relation between + * notification status and the value: + NS_PERIODIC - the period in ms + NS_MINIMUM + * - the minimum value that triggers the notification + NS_MAXIMUM - the maximum + * value that triggers the notifcation + NS_CHANGE - the resolution of the change + * value */ int16_t parameter; @@ -1155,8 +1155,8 @@ namespace am { /** * This enum can have 3 states: - HS_SINKA sinkA is the current hot one, - * sinkB is not audible + HS_SINKA sinkA is the current hot one, sinkB + * is not audible HS_SINKB sinkB is the current hot one, sinkB is not * audible HS_INTERMEDIATE the fader is stuck in between a cross-fading @@ -1571,11 +1571,11 @@ namespace am { * tuner that is not actively heard. The source state is set by the * AudioManagerController.There are 3 possible states: - SS_ON: the source - * is active + SS_ON: the source is + * active SS_OFF: the source is off - SS_PAUSED: the source is paused - * and not active. + SS_PAUSED: the source is paused and + * not active. */ am_SourceState_e sourceState; /** @@ -2076,7 +2076,7 @@ static inline const char* getTypeCollectionName() { } inline CommonAPI::Version getTypeCollectionVersion() { - return CommonAPI::Version(1, 0); + return CommonAPI::Version(2, 0); } } // namespace am diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControl.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControl.h index 5cb6ccb..779347b 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControl.h +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControl.h @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.genivi.commonapi.core 2.1.6.v20140519. * Used org.franca.core 0.8.11.201401091023. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. @@ -43,7 +43,7 @@ const char* RoutingControl::getInterfaceId() { } CommonAPI::Version RoutingControl::getInterfaceVersion() { - return CommonAPI::Version(1, 0); + return CommonAPI::Version(2, 0); } diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusProxy.cpp b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusProxy.cpp index e32836f..2cf9ecd 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusProxy.cpp +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusProxy.cpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.genivi.commonapi.core 2.1.6.v20140519. * Used org.franca.core 0.8.11.201401091023. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. @@ -27,7 +27,7 @@ std::shared_ptr<CommonAPI::DBus::DBusProxy> createRoutingControlDBusProxy( return std::make_shared<RoutingControlDBusProxy>(factory, commonApiAddress, interfaceName, busName, objectPath, dbusProxyConnection); } -__attribute__((constructor)) void registerRoutingControlDBusProxy(void) { +INITIALIZER(registerRoutingControlDBusProxy) { CommonAPI::DBus::DBusFactory::registerProxyFactoryMethod(RoutingControl::getInterfaceId(), &createRoutingControlDBusProxy); } @@ -72,7 +72,7 @@ std::future<CommonAPI::CallStatus> RoutingControlDBusProxy::asyncAbortAsync(cons /** * connects a source to a sink (at)return E_OK on success, E_UNKNOWN on error, - * E_WRONG_FORMAT in case am_CustomConnectionFormat_t does not match + * E_WRONG_FORMAT in case am_ConnectionFormat_e does not match */ void RoutingControlDBusProxy::asyncConnect(const am_Handle_s& handle, const am_connectionID_t& connectionID, const am_sourceID_t& sourceID, const am_sinkID_t& sinkID, const am_CustomConnectionFormat_t& connectionFormat, CommonAPI::CallStatus& callStatus) { CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<am_Handle_s, am_connectionID_t, am_sourceID_t, am_sinkID_t, am_CustomConnectionFormat_t>, @@ -197,8 +197,8 @@ std::future<CommonAPI::CallStatus> RoutingControlDBusProxy::asyncSetSourceStateA } /** * this function sets the sinksoundproperty. -(at)return E_OK on success, - * E_UNKNOWN on error, E_OUT_OF_RANGE in case the propery value is out of range +(at)return E_OK on success, E_UNKNOWN + * on error, E_OUT_OF_RANGE in case the propery value is out of range */ void RoutingControlDBusProxy::asyncSetSinkSoundProperties(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_SoundProperty_L& listSoundProperties, CommonAPI::CallStatus& callStatus) { CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<am_Handle_s, am_sinkID_t, am_SoundProperty_L>, @@ -221,8 +221,8 @@ std::future<CommonAPI::CallStatus> RoutingControlDBusProxy::asyncSetSinkSoundPro } /** * this function sets the sinksoundproperty. -(at)return E_OK on success, - * E_UNKNOWN on error, E_OUT_OF_RANGE in case the propery value is out of range +(at)return E_OK on success, E_UNKNOWN + * on error, E_OUT_OF_RANGE in case the propery value is out of range */ void RoutingControlDBusProxy::asyncSetSinkSoundProperty(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_SoundProperty_s& soundProperty, CommonAPI::CallStatus& callStatus) { CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<am_Handle_s, am_sinkID_t, am_SoundProperty_s>, @@ -400,7 +400,7 @@ std::future<CommonAPI::CallStatus> RoutingControlDBusProxy::asyncSetSourceNotifi void RoutingControlDBusProxy::getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const { - ownVersionMajor = 1; + ownVersionMajor = 2; ownVersionMinor = 0; } diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusProxy.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusProxy.h index f9036d4..68fc160 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusProxy.h +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusProxy.h @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.genivi.commonapi.core 2.1.6.v20140519. * Used org.franca.core 0.8.11.201401091023. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. @@ -55,7 +55,7 @@ class RoutingControlDBusProxy: virtual public RoutingControlProxyBase, virtual p /** * connects a source to a sink (at)return E_OK on success, E_UNKNOWN on error, - * E_WRONG_FORMAT in case am_CustomConnectionFormat_t does not match + * E_WRONG_FORMAT in case am_ConnectionFormat_e does not match */ virtual void asyncConnect(const am_Handle_s& handle, const am_connectionID_t& connectionID, const am_sourceID_t& sourceID, const am_sinkID_t& sinkID, const am_CustomConnectionFormat_t& connectionFormat, CommonAPI::CallStatus& callStatus); virtual std::future<CommonAPI::CallStatus> asyncConnectAsync(const am_Handle_s& handle, const am_connectionID_t& connectionID, const am_sourceID_t& sourceID, const am_sinkID_t& sinkID, const am_CustomConnectionFormat_t& connectionFormat, AsyncConnectAsyncCallback callback); @@ -95,15 +95,15 @@ class RoutingControlDBusProxy: virtual public RoutingControlProxyBase, virtual p virtual std::future<CommonAPI::CallStatus> asyncSetSourceStateAsync(const am_Handle_s& handle, const am_sourceID_t& sourceID, const am_SourceState_e& state, AsyncSetSourceStateAsyncCallback callback); /** * this function sets the sinksoundproperty. - (at)return E_OK on success, - * E_UNKNOWN on error, E_OUT_OF_RANGE in case the propery value is out of range + (at)return E_OK on success, E_UNKNOWN + * on error, E_OUT_OF_RANGE in case the propery value is out of range */ virtual void asyncSetSinkSoundProperties(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_SoundProperty_L& listSoundProperties, CommonAPI::CallStatus& callStatus); virtual std::future<CommonAPI::CallStatus> asyncSetSinkSoundPropertiesAsync(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_SoundProperty_L& listSoundProperties, AsyncSetSinkSoundPropertiesAsyncCallback callback); /** * this function sets the sinksoundproperty. - (at)return E_OK on success, - * E_UNKNOWN on error, E_OUT_OF_RANGE in case the propery value is out of range + (at)return E_OK on success, E_UNKNOWN + * on error, E_OUT_OF_RANGE in case the propery value is out of range */ virtual void asyncSetSinkSoundProperty(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_SoundProperty_s& soundProperty, CommonAPI::CallStatus& callStatus); virtual std::future<CommonAPI::CallStatus> asyncSetSinkSoundPropertyAsync(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_SoundProperty_s& soundProperty, AsyncSetSinkSoundPropertyAsyncCallback callback); diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusStubAdapter.cpp b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusStubAdapter.cpp index 8563781..b6529b8 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusStubAdapter.cpp +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusStubAdapter.cpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.genivi.commonapi.core 2.1.6.v20140519. * Used org.franca.core 0.8.11.201401091023. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. @@ -25,7 +25,7 @@ std::shared_ptr<CommonAPI::DBus::DBusStubAdapter> createRoutingControlDBusStubAd return std::make_shared<RoutingControlDBusStubAdapter>(factory, commonApiAddress, interfaceName, busName, objectPath, dbusProxyConnection, stubBase); } -__attribute__((constructor)) void registerRoutingControlDBusStubAdapter(void) { +INITIALIZER(registerRoutingControlDBusStubAdapter) { CommonAPI::DBus::DBusFactory::registerAdapterFactoryMethod(RoutingControl::getInterfaceId(), &createRoutingControlDBusStubAdapter); } @@ -38,6 +38,7 @@ RoutingControlDBusStubAdapterInternal::~RoutingControlDBusStubAdapterInternal() } void RoutingControlDBusStubAdapterInternal::deactivateManagedInstances() { + } const char* RoutingControlDBusStubAdapterInternal::getMethodsDBusIntrospectionXmlData() const { @@ -56,7 +57,7 @@ const char* RoutingControlDBusStubAdapterInternal::getMethodsDBusIntrospectionXm /** * connects a source to a sink (at)return E_OK on success, E_UNKNOWN on error, - * E_WRONG_FORMAT in case am_CustomConnectionFormat_t does not match + * E_WRONG_FORMAT in case am_ConnectionFormat_e does not match */ "<method name=\"asyncConnect\">\n" "<arg name=\"handle\" type=\"(iq)\" direction=\"in\" />\n" @@ -116,8 +117,8 @@ const char* RoutingControlDBusStubAdapterInternal::getMethodsDBusIntrospectionXm "</method>\n" /** * this function sets the sinksoundproperty. - (at)return E_OK on success, - * E_UNKNOWN on error, E_OUT_OF_RANGE in case the propery value is out of range + (at)return E_OK on success, E_UNKNOWN + * on error, E_OUT_OF_RANGE in case the propery value is out of range */ "<method name=\"asyncSetSinkSoundProperties\">\n" "<arg name=\"handle\" type=\"(iq)\" direction=\"in\" />\n" @@ -126,8 +127,8 @@ const char* RoutingControlDBusStubAdapterInternal::getMethodsDBusIntrospectionXm "</method>\n" /** * this function sets the sinksoundproperty. - (at)return E_OK on success, - * E_UNKNOWN on error, E_OUT_OF_RANGE in case the propery value is out of range + (at)return E_OK on success, E_UNKNOWN + * on error, E_OUT_OF_RANGE in case the propery value is out of range */ "<method name=\"asyncSetSinkSoundProperty\">\n" "<arg name=\"handle\" type=\"(iq)\" direction=\"in\" />\n" @@ -195,10 +196,11 @@ const char* RoutingControlDBusStubAdapterInternal::getMethodsDBusIntrospectionXm return introspectionData.c_str(); } -static CommonAPI::DBus::DBusGetAttributeStubDispatcher< +CommonAPI::DBus::DBusGetAttributeStubDispatcher< RoutingControlStub, CommonAPI::Version - > getRoutingControlInterfaceVersionStubDispatcher(&RoutingControlStub::getInterfaceVersion, "uu"); + > RoutingControlDBusStubAdapterInternal::getRoutingControlInterfaceVersionStubDispatcher(&RoutingControlStub::getInterfaceVersion, "uu"); + /** @@ -206,31 +208,31 @@ static CommonAPI::DBus::DBusGetAttributeStubDispatcher< (at)return E_OK on success, E_UNKNOWN on error, * E_NON_EXISTENT if handle was not found */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlStub, std::tuple<am_Handle_s>, std::tuple<> - > asyncAbortStubDispatcher(&RoutingControlStub::asyncAbort, ""); + > RoutingControlDBusStubAdapterInternal::asyncAbortStubDispatcher(&RoutingControlStub::asyncAbort, ""); /** * connects a source to a sink (at)return E_OK on success, E_UNKNOWN on error, - * E_WRONG_FORMAT in case am_CustomConnectionFormat_t does not match + * E_WRONG_FORMAT in case am_ConnectionFormat_e does not match */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlStub, std::tuple<am_Handle_s, am_connectionID_t, am_sourceID_t, am_sinkID_t, am_CustomConnectionFormat_t>, std::tuple<> - > asyncConnectStubDispatcher(&RoutingControlStub::asyncConnect, ""); + > RoutingControlDBusStubAdapterInternal::asyncConnectStubDispatcher(&RoutingControlStub::asyncConnect, ""); /** * disconnect a connection with given connectionID (at)return E_OK on success, * E_UNKNOWN on error, E_NON_EXISTENT if connection was not found */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlStub, std::tuple<am_Handle_s, am_connectionID_t>, std::tuple<> - > asyncDisconnectStubDispatcher(&RoutingControlStub::asyncDisconnect, ""); + > RoutingControlDBusStubAdapterInternal::asyncDisconnectStubDispatcher(&RoutingControlStub::asyncDisconnect, ""); /** * this method is used to set the volume of a sink. This function is used to drive * ramps, to mute or unmute or directly set the value. The difference is made @@ -238,11 +240,11 @@ static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< (at)return E_OK on success, E_UNKNOWN on error, * E_OUT_OF_RANGE if new volume is out of range */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlStub, std::tuple<am_Handle_s, am_sinkID_t, am_volume_t, am_CustomRampType_t, am_time_t>, std::tuple<> - > asyncSetSinkVolumeStubDispatcher(&RoutingControlStub::asyncSetSinkVolume, ""); + > RoutingControlDBusStubAdapterInternal::asyncSetSinkVolumeStubDispatcher(&RoutingControlStub::asyncSetSinkVolume, ""); /** * sets the volume of a source. This method is used to set the volume of a sink. * This function is used to drive ramps, to mute or unmute or directly set the @@ -252,96 +254,98 @@ static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< * range. triggers the acknowledge ackSourceVolumeChange */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlStub, std::tuple<am_Handle_s, am_sourceID_t, am_volume_t, am_CustomRampType_t, am_time_t>, std::tuple<> - > asyncSetSourceVolumeStubDispatcher(&RoutingControlStub::asyncSetSourceVolume, ""); + > RoutingControlDBusStubAdapterInternal::asyncSetSourceVolumeStubDispatcher(&RoutingControlStub::asyncSetSourceVolume, ""); /** * This function is used to set the source state of a particular * source. (at)return E_OK on success, E_UNKNOWN on error */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlStub, std::tuple<am_Handle_s, am_sourceID_t, am_SourceState_e>, std::tuple<> - > asyncSetSourceStateStubDispatcher(&RoutingControlStub::asyncSetSourceState, ""); + > RoutingControlDBusStubAdapterInternal::asyncSetSourceStateStubDispatcher(&RoutingControlStub::asyncSetSourceState, ""); /** * this function sets the sinksoundproperty. -(at)return E_OK on success, - * E_UNKNOWN on error, E_OUT_OF_RANGE in case the propery value is out of range +(at)return E_OK on success, E_UNKNOWN + * on error, E_OUT_OF_RANGE in case the propery value is out of range */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlStub, std::tuple<am_Handle_s, am_sinkID_t, am_SoundProperty_L>, std::tuple<> - > asyncSetSinkSoundPropertiesStubDispatcher(&RoutingControlStub::asyncSetSinkSoundProperties, ""); + > RoutingControlDBusStubAdapterInternal::asyncSetSinkSoundPropertiesStubDispatcher(&RoutingControlStub::asyncSetSinkSoundProperties, ""); /** * this function sets the sinksoundproperty. -(at)return E_OK on success, - * E_UNKNOWN on error, E_OUT_OF_RANGE in case the propery value is out of range +(at)return E_OK on success, E_UNKNOWN + * on error, E_OUT_OF_RANGE in case the propery value is out of range */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlStub, std::tuple<am_Handle_s, am_sinkID_t, am_SoundProperty_s>, std::tuple<> - > asyncSetSinkSoundPropertyStubDispatcher(&RoutingControlStub::asyncSetSinkSoundProperty, ""); + > RoutingControlDBusStubAdapterInternal::asyncSetSinkSoundPropertyStubDispatcher(&RoutingControlStub::asyncSetSinkSoundProperty, ""); /** * this function sets the sourcesoundproperty. (at)return E_OK on success, * E_UNKNOWN on error, E_OUT_OF_RANGE in case the propery value is out of range */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlStub, std::tuple<am_Handle_s, am_sourceID_t, am_SoundProperty_L>, std::tuple<> - > asyncSetSourceSoundPropertiesStubDispatcher(&RoutingControlStub::asyncSetSourceSoundProperties, ""); + > RoutingControlDBusStubAdapterInternal::asyncSetSourceSoundPropertiesStubDispatcher(&RoutingControlStub::asyncSetSourceSoundProperties, ""); /** * this function sets the sourcesoundproperty. (at)return E_OK on success, * E_UNKNOWN on error, E_OUT_OF_RANGE in case the propery value is out of range */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlStub, std::tuple<am_Handle_s, am_sourceID_t, am_SoundProperty_s>, std::tuple<> - > asyncSetSourceSoundPropertyStubDispatcher(&RoutingControlStub::asyncSetSourceSoundProperty, ""); + > RoutingControlDBusStubAdapterInternal::asyncSetSourceSoundPropertyStubDispatcher(&RoutingControlStub::asyncSetSourceSoundProperty, ""); /** * this function triggers crossfading. (at)return E_OK on success, E_UNKNOWN on * error */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlStub, std::tuple<am_Handle_s, am_crossfaderID_t, am_HotSink_e, am_CustomRampType_t, am_time_t>, std::tuple<> - > asyncCrossFadeStubDispatcher(&RoutingControlStub::asyncCrossFade, ""); + > RoutingControlDBusStubAdapterInternal::asyncCrossFadeStubDispatcher(&RoutingControlStub::asyncCrossFade, ""); /** * this function is used for early and late audio functions to set the domain * state (at)return E_OK on success, E_UNKNOWN on error */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlStub, std::tuple<am_domainID_t, am_DomainState_e>, std::tuple<am_Error_e> - > setDomainStateStubDispatcher(&RoutingControlStub::setDomainState, "i"); -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + > RoutingControlDBusStubAdapterInternal::setDomainStateStubDispatcher(&RoutingControlStub::setDomainState, "i"); +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlStub, std::tuple<am_Handle_s, am_Volumes_L>, std::tuple<> - > asyncSetVolumesStubDispatcher(&RoutingControlStub::asyncSetVolumes, ""); -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + > RoutingControlDBusStubAdapterInternal::asyncSetVolumesStubDispatcher(&RoutingControlStub::asyncSetVolumes, ""); +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlStub, std::tuple<am_Handle_s, am_sinkID_t, am_NotificationConfiguration_s>, std::tuple<> - > asyncSetSinkNotificationConfigurationStubDispatcher(&RoutingControlStub::asyncSetSinkNotificationConfiguration, ""); -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + > RoutingControlDBusStubAdapterInternal::asyncSetSinkNotificationConfigurationStubDispatcher(&RoutingControlStub::asyncSetSinkNotificationConfiguration, ""); +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlStub, std::tuple<am_Handle_s, am_sourceID_t, am_NotificationConfiguration_s>, std::tuple<> - > asyncSetSourceNotificationConfigurationStubDispatcher(&RoutingControlStub::asyncSetSourceNotificationConfiguration, ""); + > RoutingControlDBusStubAdapterInternal::asyncSetSourceNotificationConfigurationStubDispatcher(&RoutingControlStub::asyncSetSourceNotificationConfiguration, ""); + + @@ -349,6 +353,9 @@ const RoutingControlDBusStubAdapterHelper::StubDispatcherTable& RoutingControlDB return stubDispatcherTable_; } +const CommonAPI::DBus::StubAttributeTable& RoutingControlDBusStubAdapterInternal::getStubAttributeTable() { + return stubAttributeTable_; +} RoutingControlDBusStubAdapterInternal::RoutingControlDBusStubAdapterInternal( const std::shared_ptr<CommonAPI::DBus::DBusFactory>& factory, @@ -381,19 +388,19 @@ RoutingControlDBusStubAdapterInternal::RoutingControlDBusStubAdapterInternal( (at)return E_OK on success, E_UNKNOWN on error, * E_NON_EXISTENT if handle was not found */ - { { "asyncAbort", "(iq)" }, &org::genivi::am::asyncAbortStubDispatcher }, + { { "asyncAbort", "(iq)" }, &org::genivi::am::RoutingControlDBusStubAdapterInternal::asyncAbortStubDispatcher }, /** * connects a source to a sink (at)return E_OK on success, E_UNKNOWN on error, - * E_WRONG_FORMAT in case am_CustomConnectionFormat_t does not match + * E_WRONG_FORMAT in case am_ConnectionFormat_e does not match */ - { { "asyncConnect", "(iq)qqqq" }, &org::genivi::am::asyncConnectStubDispatcher }, + { { "asyncConnect", "(iq)qqqq" }, &org::genivi::am::RoutingControlDBusStubAdapterInternal::asyncConnectStubDispatcher }, /** * disconnect a connection with given connectionID (at)return E_OK on success, * E_UNKNOWN on error, E_NON_EXISTENT if connection was not found */ - { { "asyncDisconnect", "(iq)q" }, &org::genivi::am::asyncDisconnectStubDispatcher }, + { { "asyncDisconnect", "(iq)q" }, &org::genivi::am::RoutingControlDBusStubAdapterInternal::asyncDisconnectStubDispatcher }, /** * this method is used to set the volume of a sink. This function is used to drive * ramps, to mute or unmute or directly set the value. The difference is made @@ -401,7 +408,7 @@ RoutingControlDBusStubAdapterInternal::RoutingControlDBusStubAdapterInternal( (at)return E_OK on success, E_UNKNOWN on error, * E_OUT_OF_RANGE if new volume is out of range */ - { { "asyncSetSinkVolume", "(iq)qnqn" }, &org::genivi::am::asyncSetSinkVolumeStubDispatcher }, + { { "asyncSetSinkVolume", "(iq)qnqn" }, &org::genivi::am::RoutingControlDBusStubAdapterInternal::asyncSetSinkVolumeStubDispatcher }, /** * sets the volume of a source. This method is used to set the volume of a sink. * This function is used to drive ramps, to mute or unmute or directly set the @@ -411,55 +418,60 @@ RoutingControlDBusStubAdapterInternal::RoutingControlDBusStubAdapterInternal( * range. triggers the acknowledge ackSourceVolumeChange */ - { { "asyncSetSourceVolume", "(iq)qnqn" }, &org::genivi::am::asyncSetSourceVolumeStubDispatcher }, + { { "asyncSetSourceVolume", "(iq)qnqn" }, &org::genivi::am::RoutingControlDBusStubAdapterInternal::asyncSetSourceVolumeStubDispatcher }, /** * This function is used to set the source state of a particular * source. (at)return E_OK on success, E_UNKNOWN on error */ - { { "asyncSetSourceState", "(iq)qi" }, &org::genivi::am::asyncSetSourceStateStubDispatcher }, + { { "asyncSetSourceState", "(iq)qi" }, &org::genivi::am::RoutingControlDBusStubAdapterInternal::asyncSetSourceStateStubDispatcher }, /** * this function sets the sinksoundproperty. - (at)return E_OK on success, - * E_UNKNOWN on error, E_OUT_OF_RANGE in case the propery value is out of range + (at)return E_OK on success, E_UNKNOWN + * on error, E_OUT_OF_RANGE in case the propery value is out of range */ - { { "asyncSetSinkSoundProperties", "(iq)qa(qn)" }, &org::genivi::am::asyncSetSinkSoundPropertiesStubDispatcher }, + { { "asyncSetSinkSoundProperties", "(iq)qa(qn)" }, &org::genivi::am::RoutingControlDBusStubAdapterInternal::asyncSetSinkSoundPropertiesStubDispatcher }, /** * this function sets the sinksoundproperty. - (at)return E_OK on success, - * E_UNKNOWN on error, E_OUT_OF_RANGE in case the propery value is out of range + (at)return E_OK on success, E_UNKNOWN + * on error, E_OUT_OF_RANGE in case the propery value is out of range */ - { { "asyncSetSinkSoundProperty", "(iq)q(qn)" }, &org::genivi::am::asyncSetSinkSoundPropertyStubDispatcher }, + { { "asyncSetSinkSoundProperty", "(iq)q(qn)" }, &org::genivi::am::RoutingControlDBusStubAdapterInternal::asyncSetSinkSoundPropertyStubDispatcher }, /** * this function sets the sourcesoundproperty. (at)return E_OK on success, * E_UNKNOWN on error, E_OUT_OF_RANGE in case the propery value is out of range */ - { { "asyncSetSourceSoundProperties", "(iq)qa(qn)" }, &org::genivi::am::asyncSetSourceSoundPropertiesStubDispatcher }, + { { "asyncSetSourceSoundProperties", "(iq)qa(qn)" }, &org::genivi::am::RoutingControlDBusStubAdapterInternal::asyncSetSourceSoundPropertiesStubDispatcher }, /** * this function sets the sourcesoundproperty. (at)return E_OK on success, * E_UNKNOWN on error, E_OUT_OF_RANGE in case the propery value is out of range */ - { { "asyncSetSourceSoundProperty", "(iq)q(qn)" }, &org::genivi::am::asyncSetSourceSoundPropertyStubDispatcher }, + { { "asyncSetSourceSoundProperty", "(iq)q(qn)" }, &org::genivi::am::RoutingControlDBusStubAdapterInternal::asyncSetSourceSoundPropertyStubDispatcher }, /** * this function triggers crossfading. (at)return E_OK on success, E_UNKNOWN on * error */ - { { "asyncCrossFade", "(iq)qiqn" }, &org::genivi::am::asyncCrossFadeStubDispatcher }, + { { "asyncCrossFade", "(iq)qiqn" }, &org::genivi::am::RoutingControlDBusStubAdapterInternal::asyncCrossFadeStubDispatcher }, /** * this function is used for early and late audio functions to set the domain * state (at)return E_OK on success, E_UNKNOWN on error */ - { { "setDomainState", "qi" }, &org::genivi::am::setDomainStateStubDispatcher }, - { { "asyncSetVolumes", "(iq)a(i(yv)nqn)" }, &org::genivi::am::asyncSetVolumesStubDispatcher }, - { { "asyncSetSinkNotificationConfiguration", "(iq)q(qin)" }, &org::genivi::am::asyncSetSinkNotificationConfigurationStubDispatcher }, - { { "asyncSetSourceNotificationConfiguration", "(iq)q(qin)" }, &org::genivi::am::asyncSetSourceNotificationConfigurationStubDispatcher } - }) { + { { "setDomainState", "qi" }, &org::genivi::am::RoutingControlDBusStubAdapterInternal::setDomainStateStubDispatcher }, + { { "asyncSetVolumes", "(iq)a(i(yv)nqn)" }, &org::genivi::am::RoutingControlDBusStubAdapterInternal::asyncSetVolumesStubDispatcher }, + { { "asyncSetSinkNotificationConfiguration", "(iq)q(qin)" }, &org::genivi::am::RoutingControlDBusStubAdapterInternal::asyncSetSinkNotificationConfigurationStubDispatcher }, + { { "asyncSetSourceNotificationConfiguration", "(iq)q(qin)" }, &org::genivi::am::RoutingControlDBusStubAdapterInternal::asyncSetSourceNotificationConfigurationStubDispatcher } + }), + stubAttributeTable_() { + + stubDispatcherTable_.insert({ { "getInterfaceVersion", "" }, &org::genivi::am::RoutingControlDBusStubAdapterInternal::getRoutingControlInterfaceVersionStubDispatcher }); +} - stubDispatcherTable_.insert({ { "getInterfaceVersion", "" }, &org::genivi::am::getRoutingControlInterfaceVersionStubDispatcher }); +const bool RoutingControlDBusStubAdapterInternal::hasFreedesktopProperties() { + return false; } } // namespace am diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusStubAdapter.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusStubAdapter.h index 5f73bcb..77b93fe 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusStubAdapter.h +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusStubAdapter.h @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.genivi.commonapi.core 2.1.6.v20140519. * Used org.franca.core 0.8.11.201401091023. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. @@ -33,7 +33,7 @@ namespace am { typedef CommonAPI::DBus::DBusStubAdapterHelper<RoutingControlStub> RoutingControlDBusStubAdapterHelper; -class RoutingControlDBusStubAdapterInternal: public RoutingControlStubAdapter, public RoutingControlDBusStubAdapterHelper { +class RoutingControlDBusStubAdapterInternal: public virtual RoutingControlStubAdapter, public RoutingControlDBusStubAdapterHelper { public: RoutingControlDBusStubAdapterInternal( const std::shared_ptr<CommonAPI::DBus::DBusFactory>& factory, @@ -46,19 +46,175 @@ class RoutingControlDBusStubAdapterInternal: public RoutingControlStubAdapter, p ~RoutingControlDBusStubAdapterInternal(); + virtual const bool hasFreedesktopProperties(); + const RoutingControlDBusStubAdapterHelper::StubDispatcherTable& getStubDispatcherTable(); + const CommonAPI::DBus::StubAttributeTable& getStubAttributeTable(); void deactivateManagedInstances(); +static CommonAPI::DBus::DBusGetAttributeStubDispatcher< + RoutingControlStub, + CommonAPI::Version + > getRoutingControlInterfaceVersionStubDispatcher; + + + +/** + * aborts an asynchronous action. +(at)return E_OK on success, E_UNKNOWN on error, + * E_NON_EXISTENT if handle was not found + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlStub, + std::tuple<am_Handle_s>, + std::tuple<> + > asyncAbortStubDispatcher; +/** + * connects a source to a sink +(at)return E_OK on success, E_UNKNOWN on error, + * E_WRONG_FORMAT in case am_ConnectionFormat_e does not match + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlStub, + std::tuple<am_Handle_s, am_connectionID_t, am_sourceID_t, am_sinkID_t, am_CustomConnectionFormat_t>, + std::tuple<> + > asyncConnectStubDispatcher; +/** + * disconnect a connection with given connectionID +(at)return E_OK on success, + * E_UNKNOWN on error, E_NON_EXISTENT if connection was not found + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlStub, + std::tuple<am_Handle_s, am_connectionID_t>, + std::tuple<> + > asyncDisconnectStubDispatcher; +/** + * this method is used to set the volume of a sink. This function is used to drive + * ramps, to mute or unmute or directly set the value. The difference is made + * through the ramptype. +(at)return E_OK on success, E_UNKNOWN on error, + * E_OUT_OF_RANGE if new volume is out of range + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlStub, + std::tuple<am_Handle_s, am_sinkID_t, am_volume_t, am_CustomRampType_t, am_time_t>, + std::tuple<> + > asyncSetSinkVolumeStubDispatcher; +/** + * sets the volume of a source. This method is used to set the volume of a sink. + * This function is used to drive ramps, to mute or unmute or directly set the + * value. The difference is made through the ramptype. +(at)return E_OK on + * success, E_UNKNOWN on error, E_OUT_OF_RANGE if volume is out of + * range. +triggers the acknowledge ackSourceVolumeChange + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlStub, + std::tuple<am_Handle_s, am_sourceID_t, am_volume_t, am_CustomRampType_t, am_time_t>, + std::tuple<> + > asyncSetSourceVolumeStubDispatcher; +/** + * This function is used to set the source state of a particular + * source. +(at)return E_OK on success, E_UNKNOWN on error + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlStub, + std::tuple<am_Handle_s, am_sourceID_t, am_SourceState_e>, + std::tuple<> + > asyncSetSourceStateStubDispatcher; +/** + * this function sets the sinksoundproperty. +(at)return E_OK on success, E_UNKNOWN + * on error, E_OUT_OF_RANGE in case the propery value is out of range + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlStub, + std::tuple<am_Handle_s, am_sinkID_t, am_SoundProperty_L>, + std::tuple<> + > asyncSetSinkSoundPropertiesStubDispatcher; +/** + * this function sets the sinksoundproperty. +(at)return E_OK on success, E_UNKNOWN + * on error, E_OUT_OF_RANGE in case the propery value is out of range + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlStub, + std::tuple<am_Handle_s, am_sinkID_t, am_SoundProperty_s>, + std::tuple<> + > asyncSetSinkSoundPropertyStubDispatcher; +/** + * this function sets the sourcesoundproperty. +(at)return E_OK on success, + * E_UNKNOWN on error, E_OUT_OF_RANGE in case the propery value is out of range + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlStub, + std::tuple<am_Handle_s, am_sourceID_t, am_SoundProperty_L>, + std::tuple<> + > asyncSetSourceSoundPropertiesStubDispatcher; +/** + * this function sets the sourcesoundproperty. +(at)return E_OK on success, + * E_UNKNOWN on error, E_OUT_OF_RANGE in case the propery value is out of range + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlStub, + std::tuple<am_Handle_s, am_sourceID_t, am_SoundProperty_s>, + std::tuple<> + > asyncSetSourceSoundPropertyStubDispatcher; +/** + * this function triggers crossfading. +(at)return E_OK on success, E_UNKNOWN on + * error + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlStub, + std::tuple<am_Handle_s, am_crossfaderID_t, am_HotSink_e, am_CustomRampType_t, am_time_t>, + std::tuple<> + > asyncCrossFadeStubDispatcher; +/** + * this function is used for early and late audio functions to set the domain + * state +(at)return E_OK on success, E_UNKNOWN on error + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlStub, + std::tuple<am_domainID_t, am_DomainState_e>, + std::tuple<am_Error_e> + > setDomainStateStubDispatcher; +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlStub, + std::tuple<am_Handle_s, am_Volumes_L>, + std::tuple<> + > asyncSetVolumesStubDispatcher; +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlStub, + std::tuple<am_Handle_s, am_sinkID_t, am_NotificationConfiguration_s>, + std::tuple<> + > asyncSetSinkNotificationConfigurationStubDispatcher; +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlStub, + std::tuple<am_Handle_s, am_sourceID_t, am_NotificationConfiguration_s>, + std::tuple<> + > asyncSetSourceNotificationConfigurationStubDispatcher; + + + + protected: virtual const char* getMethodsDBusIntrospectionXmlData() const; - - private: + + private: RoutingControlDBusStubAdapterHelper::StubDispatcherTable stubDispatcherTable_; + CommonAPI::DBus::StubAttributeTable stubAttributeTable_; }; class RoutingControlDBusStubAdapter: public RoutingControlDBusStubAdapterInternal, public std::enable_shared_from_this<RoutingControlDBusStubAdapter> { diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserver.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserver.h index 4fe3ad8..71e7935 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserver.h +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserver.h @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.genivi.commonapi.core 2.1.6.v20140519. * Used org.franca.core 0.8.11.201401091023. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. @@ -43,7 +43,7 @@ const char* RoutingControlObserver::getInterfaceId() { } CommonAPI::Version RoutingControlObserver::getInterfaceVersion() { - return CommonAPI::Version(0, 1); + return CommonAPI::Version(2, 0); } diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusProxy.cpp b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusProxy.cpp index 9da10db..532ad94 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusProxy.cpp +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusProxy.cpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.genivi.commonapi.core 2.1.6.v20140519. * Used org.franca.core 0.8.11.201401091023. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. @@ -27,7 +27,7 @@ std::shared_ptr<CommonAPI::DBus::DBusProxy> createRoutingControlObserverDBusProx return std::make_shared<RoutingControlObserverDBusProxy>(factory, commonApiAddress, interfaceName, busName, objectPath, dbusProxyConnection); } -__attribute__((constructor)) void registerRoutingControlObserverDBusProxy(void) { +INITIALIZER(registerRoutingControlObserverDBusProxy) { CommonAPI::DBus::DBusFactory::registerProxyFactoryMethod(RoutingControlObserver::getInterfaceId(), &createRoutingControlObserverDBusProxy); } @@ -320,8 +320,8 @@ std::future<CommonAPI::CallStatus> RoutingControlObserverDBusProxy::ackSinkVolum * registered with this name, it will return the corresponding ID, if not it will * reserve an ID but not register the domain. The other parameters of the domain * will be overwritten when the domain is registered. -(at)return E_OK on - * success, E_UNKNOWN on error +(at)return E_OK on success, + * E_UNKNOWN on error */ void RoutingControlObserverDBusProxy::peekDomain(const std::string& name, CommonAPI::CallStatus& callStatus, am_domainID_t& domainID, am_Error_e& error) { CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::string>, @@ -520,8 +520,8 @@ std::future<CommonAPI::CallStatus> RoutingControlObserverDBusProxy::deregisterSi * registered with this name, it will return the corresponding ID, if not it will * reserve an ID but not register the source. The other parameters of the source * will be overwritten when the source is registered. -(at)return E_OK on - * success, E_UNKNOWN on error +(at)return E_OK on success, + * E_UNKNOWN on error */ void RoutingControlObserverDBusProxy::peekSource(const std::string& name, CommonAPI::CallStatus& callStatus, am_sourceID_t& sourceID, am_Error_e& error) { CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::string>, @@ -898,8 +898,8 @@ std::future<CommonAPI::CallStatus> RoutingControlObserverDBusProxy::updateSinkAs /** * updates data of an source. (at)return E_OK on success, E_NON_EXISTENT if the * sourceID in the struct is not valid. -Please note that only the following - * data out of am_Source_s have effect when they are +Please note that only the following data + * out of am_Source_s have effect when they are * changed: sourceClassID, listSoundProperties, @@ -1059,8 +1059,8 @@ std::future<CommonAPI::CallStatus> RoutingControlObserverDBusProxy::confirmRouti void RoutingControlObserverDBusProxy::getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const { - ownVersionMajor = 0; - ownVersionMinor = 1; + ownVersionMajor = 2; + ownVersionMinor = 0; } } // namespace am diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusProxy.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusProxy.h index 81d8885..3b832d8 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusProxy.h +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusProxy.h @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.genivi.commonapi.core 2.1.6.v20140519. * Used org.franca.core 0.8.11.201401091023. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. @@ -114,8 +114,8 @@ class RoutingControlObserverDBusProxy: virtual public RoutingControlObserverProx * registered with this name, it will return the corresponding ID, if not it will * reserve an ID but not register the domain. The other parameters of the domain * will be overwritten when the domain is registered. - (at)return E_OK on - * success, E_UNKNOWN on error + (at)return E_OK on success, + * E_UNKNOWN on error */ virtual void peekDomain(const std::string& name, CommonAPI::CallStatus& callStatus, am_domainID_t& domainID, am_Error_e& error); virtual std::future<CommonAPI::CallStatus> peekDomainAsync(const std::string& name, PeekDomainAsyncCallback callback); @@ -178,8 +178,8 @@ class RoutingControlObserverDBusProxy: virtual public RoutingControlObserverProx * registered with this name, it will return the corresponding ID, if not it will * reserve an ID but not register the source. The other parameters of the source * will be overwritten when the source is registered. - (at)return E_OK on - * success, E_UNKNOWN on error + (at)return E_OK on success, + * E_UNKNOWN on error */ virtual void peekSource(const std::string& name, CommonAPI::CallStatus& callStatus, am_sourceID_t& sourceID, am_Error_e& error); virtual std::future<CommonAPI::CallStatus> peekSourceAsync(const std::string& name, PeekSourceAsyncCallback callback); @@ -284,8 +284,8 @@ class RoutingControlObserverDBusProxy: virtual public RoutingControlObserverProx /** * updates data of an source. (at)return E_OK on success, E_NON_EXISTENT if the * sourceID in the struct is not valid. - Please note that only the following - * data out of am_Source_s have effect when they are + Please note that only the following data + * out of am_Source_s have effect when they are * changed: sourceClassID, listSoundProperties, diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusStubAdapter.cpp b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusStubAdapter.cpp index 4c8053d..5386b6c 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusStubAdapter.cpp +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusStubAdapter.cpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.genivi.commonapi.core 2.1.6.v20140519. * Used org.franca.core 0.8.11.201401091023. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. @@ -25,7 +25,7 @@ std::shared_ptr<CommonAPI::DBus::DBusStubAdapter> createRoutingControlObserverDB return std::make_shared<RoutingControlObserverDBusStubAdapter>(factory, commonApiAddress, interfaceName, busName, objectPath, dbusProxyConnection, stubBase); } -__attribute__((constructor)) void registerRoutingControlObserverDBusStubAdapter(void) { +INITIALIZER(registerRoutingControlObserverDBusStubAdapter) { CommonAPI::DBus::DBusFactory::registerAdapterFactoryMethod(RoutingControlObserver::getInterfaceId(), &createRoutingControlObserverDBusStubAdapter); } @@ -38,6 +38,7 @@ RoutingControlObserverDBusStubAdapterInternal::~RoutingControlObserverDBusStubAd } void RoutingControlObserverDBusStubAdapterInternal::deactivateManagedInstances() { + } const char* RoutingControlObserverDBusStubAdapterInternal::getMethodsDBusIntrospectionXmlData() const { @@ -149,8 +150,8 @@ const char* RoutingControlObserverDBusStubAdapterInternal::getMethodsDBusIntrosp * registered with this name, it will return the corresponding ID, if not it will * reserve an ID but not register the domain. The other parameters of the domain * will be overwritten when the domain is registered. - (at)return E_OK on - * success, E_UNKNOWN on error + (at)return E_OK on success, + * E_UNKNOWN on error */ "<method name=\"peekDomain\">\n" "<arg name=\"name\" type=\"s\" direction=\"in\" />\n" @@ -236,8 +237,8 @@ const char* RoutingControlObserverDBusStubAdapterInternal::getMethodsDBusIntrosp * registered with this name, it will return the corresponding ID, if not it will * reserve an ID but not register the source. The other parameters of the source * will be overwritten when the source is registered. - (at)return E_OK on - * success, E_UNKNOWN on error + (at)return E_OK on success, + * E_UNKNOWN on error */ "<method name=\"peekSource\">\n" "<arg name=\"name\" type=\"s\" direction=\"in\" />\n" @@ -384,8 +385,8 @@ const char* RoutingControlObserverDBusStubAdapterInternal::getMethodsDBusIntrosp /** * updates data of an source. (at)return E_OK on success, E_NON_EXISTENT if the * sourceID in the struct is not valid. - Please note that only the following - * data out of am_Source_s have effect when they are + Please note that only the following data + * out of am_Source_s have effect when they are * changed: sourceClassID, listSoundProperties, @@ -445,10 +446,10 @@ const char* RoutingControlObserverDBusStubAdapterInternal::getMethodsDBusIntrosp return introspectionData.c_str(); } -static CommonAPI::DBus::DBusGetAttributeStubDispatcher< +CommonAPI::DBus::DBusGetAttributeStubDispatcher< RoutingControlObserverStub, CommonAPI::Version - > getRoutingControlObserverInterfaceVersionStubDispatcher(&RoutingControlObserverStub::getInterfaceVersion, "uu"); + > RoutingControlObserverDBusStubAdapterInternal::getRoutingControlObserverInterfaceVersionStubDispatcher(&RoutingControlObserverStub::getInterfaceVersion, "uu"); /** * This attribute signals to the clients the current routing state. @@ -456,164 +457,164 @@ A client * should notify himself to this attribute in order to know the current state and * act accordingly. */ -static CommonAPI::DBus::DBusGetAttributeStubDispatcher< +CommonAPI::DBus::DBusGetAttributeStubDispatcher< RoutingControlObserverStub, am_RoutingReady_e - > getRoutingReadyAttributeStubDispatcher(&RoutingControlObserverStub::getRoutingReadyAttribute, "i"); + > RoutingControlObserverDBusStubAdapterInternal::getRoutingReadyAttributeStubDispatcher(&RoutingControlObserverStub::getRoutingReadyAttribute, "i"); /** * acknowledges a asyncConnect */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_Handle_s, am_connectionID_t, am_Error_e>, std::tuple<> - > ackConnectStubDispatcher(&RoutingControlObserverStub::ackConnect, ""); + > RoutingControlObserverDBusStubAdapterInternal::ackConnectStubDispatcher(&RoutingControlObserverStub::ackConnect, ""); /** * acknowledges a asyncDisconnect */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_Handle_s, am_connectionID_t, am_Error_e>, std::tuple<> - > ackDisconnectStubDispatcher(&RoutingControlObserverStub::ackDisconnect, ""); + > RoutingControlObserverDBusStubAdapterInternal::ackDisconnectStubDispatcher(&RoutingControlObserverStub::ackDisconnect, ""); /** * acknowledges a asyncsetSinkVolume */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_Handle_s, am_volume_t, am_Error_e>, std::tuple<> - > ackSetSinkVolumeChangeStubDispatcher(&RoutingControlObserverStub::ackSetSinkVolumeChange, ""); + > RoutingControlObserverDBusStubAdapterInternal::ackSetSinkVolumeChangeStubDispatcher(&RoutingControlObserverStub::ackSetSinkVolumeChange, ""); /** * acknowledges a asyncsetSourceVolume */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_Handle_s, am_volume_t, am_Error_e>, std::tuple<> - > ackSetSourceVolumeChangeStubDispatcher(&RoutingControlObserverStub::ackSetSourceVolumeChange, ""); + > RoutingControlObserverDBusStubAdapterInternal::ackSetSourceVolumeChangeStubDispatcher(&RoutingControlObserverStub::ackSetSourceVolumeChange, ""); /** * acknowlegde for asyncSetSourceState */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_Handle_s, am_Error_e>, std::tuple<> - > ackSetSourceStateStubDispatcher(&RoutingControlObserverStub::ackSetSourceState, ""); + > RoutingControlObserverDBusStubAdapterInternal::ackSetSourceStateStubDispatcher(&RoutingControlObserverStub::ackSetSourceState, ""); /** * acknowledges asyncSetSinkSoundProperties */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_Handle_s, am_Error_e>, std::tuple<> - > ackSetSinkSoundPropertiesStubDispatcher(&RoutingControlObserverStub::ackSetSinkSoundProperties, ""); + > RoutingControlObserverDBusStubAdapterInternal::ackSetSinkSoundPropertiesStubDispatcher(&RoutingControlObserverStub::ackSetSinkSoundProperties, ""); /** * acknowledges asyncSetSinkSoundProperty */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_Handle_s, am_Error_e>, std::tuple<> - > ackSetSinkSoundPropertyStubDispatcher(&RoutingControlObserverStub::ackSetSinkSoundProperty, ""); + > RoutingControlObserverDBusStubAdapterInternal::ackSetSinkSoundPropertyStubDispatcher(&RoutingControlObserverStub::ackSetSinkSoundProperty, ""); /** * acknowledges asyncSetSourceSoundProperties */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_Handle_s, am_Error_e>, std::tuple<> - > ackSetSourceSoundPropertiesStubDispatcher(&RoutingControlObserverStub::ackSetSourceSoundProperties, ""); + > RoutingControlObserverDBusStubAdapterInternal::ackSetSourceSoundPropertiesStubDispatcher(&RoutingControlObserverStub::ackSetSourceSoundProperties, ""); /** * acknowledges asyncSetSourceSoundProperty */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_Handle_s, am_Error_e>, std::tuple<> - > ackSetSourceSoundPropertyStubDispatcher(&RoutingControlObserverStub::ackSetSourceSoundProperty, ""); + > RoutingControlObserverDBusStubAdapterInternal::ackSetSourceSoundPropertyStubDispatcher(&RoutingControlObserverStub::ackSetSourceSoundProperty, ""); /** * acknowledges asyncCrossFade */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_Handle_s, am_HotSink_e, am_Error_e>, std::tuple<> - > ackCrossFadingStubDispatcher(&RoutingControlObserverStub::ackCrossFading, ""); + > RoutingControlObserverDBusStubAdapterInternal::ackCrossFadingStubDispatcher(&RoutingControlObserverStub::ackCrossFading, ""); /** * acknowledges a volume tick. This can be used to display volumechanges during * ramps */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_Handle_s, am_sourceID_t, am_volume_t>, std::tuple<> - > ackSourceVolumeTickStubDispatcher(&RoutingControlObserverStub::ackSourceVolumeTick, ""); + > RoutingControlObserverDBusStubAdapterInternal::ackSourceVolumeTickStubDispatcher(&RoutingControlObserverStub::ackSourceVolumeTick, ""); /** * acknowledges a volume tick. This can be used to display volumechanges during * ramps */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_Handle_s, am_sinkID_t, am_volume_t>, std::tuple<> - > ackSinkVolumeTickStubDispatcher(&RoutingControlObserverStub::ackSinkVolumeTick, ""); + > RoutingControlObserverDBusStubAdapterInternal::ackSinkVolumeTickStubDispatcher(&RoutingControlObserverStub::ackSinkVolumeTick, ""); /** * This function returns the ID to the given domainName. If already a domain is * registered with this name, it will return the corresponding ID, if not it will * reserve an ID but not register the domain. The other parameters of the domain * will be overwritten when the domain is registered. -(at)return E_OK on - * success, E_UNKNOWN on error +(at)return E_OK on success, + * E_UNKNOWN on error */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<std::string>, std::tuple<am_domainID_t, am_Error_e> - > peekDomainStubDispatcher(&RoutingControlObserverStub::peekDomain, "qi"); + > RoutingControlObserverDBusStubAdapterInternal::peekDomainStubDispatcher(&RoutingControlObserverStub::peekDomain, "qi"); /** * registers a domain (at)return E_OK on succes, E_ALREADY_EXISTENT if already * registered E_UNKOWN on error */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_Domain_s, std::string, std::string>, std::tuple<am_domainID_t, am_Error_e> - > registerDomainStubDispatcher(&RoutingControlObserverStub::registerDomain, "qi"); + > RoutingControlObserverDBusStubAdapterInternal::registerDomainStubDispatcher(&RoutingControlObserverStub::registerDomain, "qi"); /** * deregisters a domain. All sources, sinks, gateways and crossfaders from that * domain will be removed as well. (at)return E_OK on succes, E_NON_EXISTENT if * not found E_UNKOWN on error */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_domainID_t>, std::tuple<am_Error_e> - > deregisterDomainStubDispatcher(&RoutingControlObserverStub::deregisterDomain, "i"); + > RoutingControlObserverDBusStubAdapterInternal::deregisterDomainStubDispatcher(&RoutingControlObserverStub::deregisterDomain, "i"); /** * registers a gateway. (at)return E_OK on succes, E_ALREADY_EXISTENT if already * registered E_UNKOWN on error */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_Gateway_s>, std::tuple<am_gatewayID_t, am_Error_e> - > registerGatewayStubDispatcher(&RoutingControlObserverStub::registerGateway, "qi"); + > RoutingControlObserverDBusStubAdapterInternal::registerGatewayStubDispatcher(&RoutingControlObserverStub::registerGateway, "qi"); /** * deregisters a gateway. Also removes all sinks and sources of the controlling * domain. (at)return E_OK on succes, E_NON_EXISTENT if not found E_UNKOWN on * error */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_gatewayID_t>, std::tuple<am_Error_e> - > deregisterGatewayStubDispatcher(&RoutingControlObserverStub::deregisterGateway, "i"); + > RoutingControlObserverDBusStubAdapterInternal::deregisterGatewayStubDispatcher(&RoutingControlObserverStub::deregisterGateway, "i"); /** * This function returns the ID to the given sinkName. If already a sink is * registered with this name, it will return the corresponding ID, if not it will @@ -622,45 +623,45 @@ static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< (at)return E_OK on success, * E_UNKNOWN on error */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<std::string>, std::tuple<am_sinkID_t, am_Error_e> - > peekSinkStubDispatcher(&RoutingControlObserverStub::peekSink, "qi"); + > RoutingControlObserverDBusStubAdapterInternal::peekSinkStubDispatcher(&RoutingControlObserverStub::peekSink, "qi"); /** * Registers a sink. If the sink is part of a gateway, the listconnectionFormats * is copied to the gatewayInformation (at)return E_OK on succes, * E_ALREADY_EXISTENT if already registered E_UNKOWN on error */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_Sink_s>, std::tuple<am_sinkID_t, am_Error_e> - > registerSinkStubDispatcher(&RoutingControlObserverStub::registerSink, "qi"); + > RoutingControlObserverDBusStubAdapterInternal::registerSinkStubDispatcher(&RoutingControlObserverStub::registerSink, "qi"); /** * deregisters a sink. (at)return E_OK on succes, E_NON_EXISTENT if not found * E_UNKOWN on error */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_sinkID_t>, std::tuple<am_Error_e> - > deregisterSinkStubDispatcher(&RoutingControlObserverStub::deregisterSink, "i"); + > RoutingControlObserverDBusStubAdapterInternal::deregisterSinkStubDispatcher(&RoutingControlObserverStub::deregisterSink, "i"); /** * This function returns the ID to the given sourceName. If already a source is * registered with this name, it will return the corresponding ID, if not it will * reserve an ID but not register the source. The other parameters of the source * will be overwritten when the source is registered. -(at)return E_OK on - * success, E_UNKNOWN on error +(at)return E_OK on success, + * E_UNKNOWN on error */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<std::string>, std::tuple<am_sourceID_t, am_Error_e> - > peekSourceStubDispatcher(&RoutingControlObserverStub::peekSource, "qi"); + > RoutingControlObserverDBusStubAdapterInternal::peekSourceStubDispatcher(&RoutingControlObserverStub::peekSource, "qi"); /** * registers a source. If the source is part of a gateway, the * listconnectionFormats is copied to the gatewayInformation @@ -668,147 +669,147 @@ static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< * success, E_UNKNOWN on error, E_ALREADY_EXIST if either name or sourceID * already exists */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_Source_s>, std::tuple<am_sourceID_t, am_Error_e> - > registerSourceStubDispatcher(&RoutingControlObserverStub::registerSource, "qi"); + > RoutingControlObserverDBusStubAdapterInternal::registerSourceStubDispatcher(&RoutingControlObserverStub::registerSource, "qi"); /** * deregisters a source (at)return E_OK on succes, E_NON_EXISTENT if not found * E_UNKOWN on error */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_sourceID_t>, std::tuple<am_Error_e> - > deregisterSourceStubDispatcher(&RoutingControlObserverStub::deregisterSource, "i"); + > RoutingControlObserverDBusStubAdapterInternal::deregisterSourceStubDispatcher(&RoutingControlObserverStub::deregisterSource, "i"); /** * this function registers a crossfader. (at)return E_OK on succes, * E_ALREADY_EXISTENT if already registered E_UNKOWN on error */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_Crossfader_s>, std::tuple<am_crossfaderID_t, am_Error_e> - > registerCrossfaderStubDispatcher(&RoutingControlObserverStub::registerCrossfader, "qi"); + > RoutingControlObserverDBusStubAdapterInternal::registerCrossfaderStubDispatcher(&RoutingControlObserverStub::registerCrossfader, "qi"); /** * this function deregisters a crossfader. removes all sources and sinks assiated * as well. (at)return E_OK on succes, E_NON_EXISTENT if not found E_UNKOWN on * error */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_crossfaderID_t>, std::tuple<am_Error_e> - > deregisterCrossfaderStubDispatcher(&RoutingControlObserverStub::deregisterCrossfader, "i"); + > RoutingControlObserverDBusStubAdapterInternal::deregisterCrossfaderStubDispatcher(&RoutingControlObserverStub::deregisterCrossfader, "i"); /** * this function peeks a sourceclassID. It is used by the RoutingPlugins to * determine the SinkClassIDs of a sinkClass. (at)return E_OK on succes, * E_DATABASE_ERROR on error */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<std::string>, std::tuple<am_sourceClass_t, am_Error_e> - > peekSourceClassIDStubDispatcher(&RoutingControlObserverStub::peekSourceClassID, "qi"); + > RoutingControlObserverDBusStubAdapterInternal::peekSourceClassIDStubDispatcher(&RoutingControlObserverStub::peekSourceClassID, "qi"); /** * this function peeks a sourceclassID. It is used by the RoutingPlugins to * determine the SinkClassIDs of a sinkClass. (at)return E_OK on succes, * E_DATABASE_ERROR on error */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<std::string>, std::tuple<am_sinkClass_t, am_Error_e> - > peekSinkClassIDStubDispatcher(&RoutingControlObserverStub::peekSinkClassID, "qi"); + > RoutingControlObserverDBusStubAdapterInternal::peekSinkClassIDStubDispatcher(&RoutingControlObserverStub::peekSinkClassID, "qi"); /** * is called when a low level interrupt changes it status. */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_sourceID_t, am_InterruptState_e>, std::tuple<> - > hookInterruptStatusChangeStubDispatcher(&RoutingControlObserverStub::hookInterruptStatusChange, ""); + > RoutingControlObserverDBusStubAdapterInternal::hookInterruptStatusChangeStubDispatcher(&RoutingControlObserverStub::hookInterruptStatusChange, ""); /** * This hook is called when all elements from a domain are registered. Is used by * the Controller to know when all expected domains are finally registered */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_domainID_t>, std::tuple<> - > hookDomainRegistrationCompleteStubDispatcher(&RoutingControlObserverStub::hookDomainRegistrationComplete, ""); + > RoutingControlObserverDBusStubAdapterInternal::hookDomainRegistrationCompleteStubDispatcher(&RoutingControlObserverStub::hookDomainRegistrationComplete, ""); /** * is called when a sink changes its availability */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_sinkID_t, am_Availability_s>, std::tuple<> - > hookSinkAvailablityStatusChangeStubDispatcher(&RoutingControlObserverStub::hookSinkAvailablityStatusChange, ""); + > RoutingControlObserverDBusStubAdapterInternal::hookSinkAvailablityStatusChangeStubDispatcher(&RoutingControlObserverStub::hookSinkAvailablityStatusChange, ""); /** * is called when a source changes its availability */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_sourceID_t, am_Availability_s>, std::tuple<> - > hookSourceAvailablityStatusChangeStubDispatcher(&RoutingControlObserverStub::hookSourceAvailablityStatusChange, ""); + > RoutingControlObserverDBusStubAdapterInternal::hookSourceAvailablityStatusChangeStubDispatcher(&RoutingControlObserverStub::hookSourceAvailablityStatusChange, ""); /** * is called when a domain changes its status. This used for early domains only */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_domainID_t, am_DomainState_e>, std::tuple<> - > hookDomainStateChangeStubDispatcher(&RoutingControlObserverStub::hookDomainStateChange, ""); + > RoutingControlObserverDBusStubAdapterInternal::hookDomainStateChangeStubDispatcher(&RoutingControlObserverStub::hookDomainStateChange, ""); /** * is called when the timinginformation (delay) changed for a connection. */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_connectionID_t, am_timeSync_t>, std::tuple<> - > hookTimingInformationChangedStubDispatcher(&RoutingControlObserverStub::hookTimingInformationChanged, ""); + > RoutingControlObserverDBusStubAdapterInternal::hookTimingInformationChangedStubDispatcher(&RoutingControlObserverStub::hookTimingInformationChanged, ""); /** * this function is used to send out all data that has been changed in an early * state. (at)return E_OK on success, E_UNKNOWN on error */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_EarlyData_L>, std::tuple<> - > sendChangedDataStubDispatcher(&RoutingControlObserverStub::sendChangedData, ""); + > RoutingControlObserverDBusStubAdapterInternal::sendChangedDataStubDispatcher(&RoutingControlObserverStub::sendChangedData, ""); /** * updates data of an gateway. (at)return E_OK on success, E_NON_EXISTENT if the * gatewayID is not valid. */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_gatewayID_t, am_ConnectionFormat_L, am_ConnectionFormat_L, am_Convertion_L>, std::tuple<am_Error_e> - > updateGatewayStubDispatcher(&RoutingControlObserverStub::updateGateway, "i"); + > RoutingControlObserverDBusStubAdapterInternal::updateGatewayStubDispatcher(&RoutingControlObserverStub::updateGateway, "i"); /** * updates data of an gateway. (at)return E_OK on success, E_NON_EXISTENT if the * sinkID is not valid. */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_sinkID_t, am_sinkClass_t, am_SoundProperty_L, am_ConnectionFormat_L, am_MainSoundProperty_L>, std::tuple<am_Error_e> - > updateSinkStubDispatcher(&RoutingControlObserverStub::updateSink, "i"); + > RoutingControlObserverDBusStubAdapterInternal::updateSinkStubDispatcher(&RoutingControlObserverStub::updateSink, "i"); /** * updates data of an source. (at)return E_OK on success, E_NON_EXISTENT if the * sourceID in the struct is not valid. -Please note that only the following - * data out of am_Source_s have effect when they are +Please note that only the following data + * out of am_Source_s have effect when they are * changed: sourceClassID, listSoundProperties, @@ -816,56 +817,57 @@ listConnectionFormats, * listMainSoundProperties */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_sourceID_t, am_sourceClass_t, am_SoundProperty_L, am_ConnectionFormat_L, am_MainSoundProperty_L>, std::tuple<am_Error_e> - > updateSourceStubDispatcher(&RoutingControlObserverStub::updateSource, "i"); + > RoutingControlObserverDBusStubAdapterInternal::updateSourceStubDispatcher(&RoutingControlObserverStub::updateSource, "i"); /** * acknowledges a asyncSetSinkVolumes */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_Handle_s, am_Volumes_L, am_Error_e>, std::tuple<> - > ackSetVolumesStubDispatcher(&RoutingControlObserverStub::ackSetVolumes, ""); + > RoutingControlObserverDBusStubAdapterInternal::ackSetVolumesStubDispatcher(&RoutingControlObserverStub::ackSetVolumes, ""); /** * The acknowledge of the SinkNotificationConfiguration */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_Handle_s, am_Error_e>, std::tuple<> - > ackSinkNotificationConfigurationStubDispatcher(&RoutingControlObserverStub::ackSinkNotificationConfiguration, ""); + > RoutingControlObserverDBusStubAdapterInternal::ackSinkNotificationConfigurationStubDispatcher(&RoutingControlObserverStub::ackSinkNotificationConfiguration, ""); /** * The acknowledge of the SourceNotificationConfiguration */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_Handle_s, am_Error_e>, std::tuple<> - > ackSourceNotificationConfigurationStubDispatcher(&RoutingControlObserverStub::ackSourceNotificationConfiguration, ""); + > RoutingControlObserverDBusStubAdapterInternal::ackSourceNotificationConfigurationStubDispatcher(&RoutingControlObserverStub::ackSourceNotificationConfiguration, ""); /** * is called whenever a notified value needs to be send */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_sinkID_t, am_NotificationPayload_s>, std::tuple<> - > hookSinkNotificationDataChangeStubDispatcher(&RoutingControlObserverStub::hookSinkNotificationDataChange, ""); + > RoutingControlObserverDBusStubAdapterInternal::hookSinkNotificationDataChangeStubDispatcher(&RoutingControlObserverStub::hookSinkNotificationDataChange, ""); /** * is called whenever a notified value needs to be send */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_sourceID_t, am_NotificationPayload_s>, std::tuple<> - > hookSourceNotificationDataChangeStubDispatcher(&RoutingControlObserverStub::hookSourceNotificationDataChange, ""); -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + > RoutingControlObserverDBusStubAdapterInternal::hookSourceNotificationDataChangeStubDispatcher(&RoutingControlObserverStub::hookSourceNotificationDataChange, ""); +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<std::string>, std::tuple<> - > confirmRoutingRundownStubDispatcher(&RoutingControlObserverStub::confirmRoutingRundown, ""); + > RoutingControlObserverDBusStubAdapterInternal::confirmRoutingRundownStubDispatcher(&RoutingControlObserverStub::confirmRoutingRundown, ""); + /** * This attribute signals to the clients the current routing state. @@ -884,10 +886,14 @@ void RoutingControlObserverDBusStubAdapterInternal::fireRoutingReadyAttributeCha } + const RoutingControlObserverDBusStubAdapterHelper::StubDispatcherTable& RoutingControlObserverDBusStubAdapterInternal::getStubDispatcherTable() { return stubDispatcherTable_; } +const CommonAPI::DBus::StubAttributeTable& RoutingControlObserverDBusStubAdapterInternal::getStubAttributeTable() { + return stubAttributeTable_; +} RoutingControlObserverDBusStubAdapterInternal::RoutingControlObserverDBusStubAdapterInternal( const std::shared_ptr<CommonAPI::DBus::DBusFactory>& factory, @@ -921,92 +927,92 @@ RoutingControlObserverDBusStubAdapterInternal::RoutingControlObserverDBusStubAda * should notify himself to this attribute in order to know the current state and * act accordingly. */ - { { "getRoutingReadyAttribute", "" }, &org::genivi::am::getRoutingReadyAttributeStubDispatcher } + { { "getRoutingReadyAttribute", "" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::getRoutingReadyAttributeStubDispatcher } , /** * acknowledges a asyncConnect */ - { { "ackConnect", "(iq)qi" }, &org::genivi::am::ackConnectStubDispatcher }, + { { "ackConnect", "(iq)qi" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::ackConnectStubDispatcher }, /** * acknowledges a asyncDisconnect */ - { { "ackDisconnect", "(iq)qi" }, &org::genivi::am::ackDisconnectStubDispatcher }, + { { "ackDisconnect", "(iq)qi" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::ackDisconnectStubDispatcher }, /** * acknowledges a asyncsetSinkVolume */ - { { "ackSetSinkVolumeChange", "(iq)ni" }, &org::genivi::am::ackSetSinkVolumeChangeStubDispatcher }, + { { "ackSetSinkVolumeChange", "(iq)ni" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::ackSetSinkVolumeChangeStubDispatcher }, /** * acknowledges a asyncsetSourceVolume */ - { { "ackSetSourceVolumeChange", "(iq)ni" }, &org::genivi::am::ackSetSourceVolumeChangeStubDispatcher }, + { { "ackSetSourceVolumeChange", "(iq)ni" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::ackSetSourceVolumeChangeStubDispatcher }, /** * acknowlegde for asyncSetSourceState */ - { { "ackSetSourceState", "(iq)i" }, &org::genivi::am::ackSetSourceStateStubDispatcher }, + { { "ackSetSourceState", "(iq)i" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::ackSetSourceStateStubDispatcher }, /** * acknowledges asyncSetSinkSoundProperties */ - { { "ackSetSinkSoundProperties", "(iq)i" }, &org::genivi::am::ackSetSinkSoundPropertiesStubDispatcher }, + { { "ackSetSinkSoundProperties", "(iq)i" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::ackSetSinkSoundPropertiesStubDispatcher }, /** * acknowledges asyncSetSinkSoundProperty */ - { { "ackSetSinkSoundProperty", "(iq)i" }, &org::genivi::am::ackSetSinkSoundPropertyStubDispatcher }, + { { "ackSetSinkSoundProperty", "(iq)i" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::ackSetSinkSoundPropertyStubDispatcher }, /** * acknowledges asyncSetSourceSoundProperties */ - { { "ackSetSourceSoundProperties", "(iq)i" }, &org::genivi::am::ackSetSourceSoundPropertiesStubDispatcher }, + { { "ackSetSourceSoundProperties", "(iq)i" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::ackSetSourceSoundPropertiesStubDispatcher }, /** * acknowledges asyncSetSourceSoundProperty */ - { { "ackSetSourceSoundProperty", "(iq)i" }, &org::genivi::am::ackSetSourceSoundPropertyStubDispatcher }, + { { "ackSetSourceSoundProperty", "(iq)i" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::ackSetSourceSoundPropertyStubDispatcher }, /** * acknowledges asyncCrossFade */ - { { "ackCrossFading", "(iq)ii" }, &org::genivi::am::ackCrossFadingStubDispatcher }, + { { "ackCrossFading", "(iq)ii" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::ackCrossFadingStubDispatcher }, /** * acknowledges a volume tick. This can be used to display volumechanges during * ramps */ - { { "ackSourceVolumeTick", "(iq)qn" }, &org::genivi::am::ackSourceVolumeTickStubDispatcher }, + { { "ackSourceVolumeTick", "(iq)qn" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::ackSourceVolumeTickStubDispatcher }, /** * acknowledges a volume tick. This can be used to display volumechanges during * ramps */ - { { "ackSinkVolumeTick", "(iq)qn" }, &org::genivi::am::ackSinkVolumeTickStubDispatcher }, + { { "ackSinkVolumeTick", "(iq)qn" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::ackSinkVolumeTickStubDispatcher }, /** * This function returns the ID to the given domainName. If already a domain is * registered with this name, it will return the corresponding ID, if not it will * reserve an ID but not register the domain. The other parameters of the domain * will be overwritten when the domain is registered. - (at)return E_OK on - * success, E_UNKNOWN on error + (at)return E_OK on success, + * E_UNKNOWN on error */ - { { "peekDomain", "s" }, &org::genivi::am::peekDomainStubDispatcher }, + { { "peekDomain", "s" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::peekDomainStubDispatcher }, /** * registers a domain (at)return E_OK on succes, E_ALREADY_EXISTENT if already * registered E_UNKOWN on error */ - { { "registerDomain", "(qsssbbi)ss" }, &org::genivi::am::registerDomainStubDispatcher }, + { { "registerDomain", "(qsssbbi)ss" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::registerDomainStubDispatcher }, /** * deregisters a domain. All sources, sinks, gateways and crossfaders from that * domain will be removed as well. (at)return E_OK on succes, E_NON_EXISTENT if * not found E_UNKOWN on error */ - { { "deregisterDomain", "q" }, &org::genivi::am::deregisterDomainStubDispatcher }, + { { "deregisterDomain", "q" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::deregisterDomainStubDispatcher }, /** * registers a gateway. (at)return E_OK on succes, E_ALREADY_EXISTENT if already * registered E_UNKOWN on error */ - { { "registerGateway", "(qsqqqqqaqaqab)" }, &org::genivi::am::registerGatewayStubDispatcher }, + { { "registerGateway", "(qsqqqqqaqaqab)" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::registerGatewayStubDispatcher }, /** * deregisters a gateway. Also removes all sinks and sources of the controlling * domain. (at)return E_OK on succes, E_NON_EXISTENT if not found E_UNKOWN on * error */ - { { "deregisterGateway", "q" }, &org::genivi::am::deregisterGatewayStubDispatcher }, + { { "deregisterGateway", "q" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::deregisterGatewayStubDispatcher }, /** * This function returns the ID to the given sinkName. If already a sink is * registered with this name, it will return the corresponding ID, if not it will @@ -1015,29 +1021,29 @@ RoutingControlObserverDBusStubAdapterInternal::RoutingControlObserverDBusStubAda (at)return E_OK on success, * E_UNKNOWN on error */ - { { "peekSink", "s" }, &org::genivi::am::peekSinkStubDispatcher }, + { { "peekSink", "s" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::peekSinkStubDispatcher }, /** * Registers a sink. If the sink is part of a gateway, the listconnectionFormats * is copied to the gatewayInformation (at)return E_OK on succes, * E_ALREADY_EXISTENT if already registered E_UNKOWN on error */ - { { "registerSink", "(qsqqnb(iq)ina(qn)aqa(qn)a(qin)a(qin))" }, &org::genivi::am::registerSinkStubDispatcher }, + { { "registerSink", "(qsqqnb(iq)ina(qn)aqa(qn)a(qin)a(qin))" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::registerSinkStubDispatcher }, /** * deregisters a sink. (at)return E_OK on succes, E_NON_EXISTENT if not found * E_UNKOWN on error */ - { { "deregisterSink", "q" }, &org::genivi::am::deregisterSinkStubDispatcher }, + { { "deregisterSink", "q" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::deregisterSinkStubDispatcher }, /** * This function returns the ID to the given sourceName. If already a source is * registered with this name, it will return the corresponding ID, if not it will * reserve an ID but not register the source. The other parameters of the source * will be overwritten when the source is registered. - (at)return E_OK on - * success, E_UNKNOWN on error + (at)return E_OK on success, + * E_UNKNOWN on error */ - { { "peekSource", "s" }, &org::genivi::am::peekSourceStubDispatcher }, + { { "peekSource", "s" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::peekSourceStubDispatcher }, /** * registers a source. If the source is part of a gateway, the * listconnectionFormats is copied to the gatewayInformation @@ -1045,87 +1051,87 @@ RoutingControlObserverDBusStubAdapterInternal::RoutingControlObserverDBusStubAda * success, E_UNKNOWN on error, E_ALREADY_EXIST if either name or sourceID * already exists */ - { { "registerSource", "(qqsqinb(iq)ia(qn)aqa(qn)a(qin)a(qin))" }, &org::genivi::am::registerSourceStubDispatcher }, + { { "registerSource", "(qqsqinb(iq)ia(qn)aqa(qn)a(qin)a(qin))" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::registerSourceStubDispatcher }, /** * deregisters a source (at)return E_OK on succes, E_NON_EXISTENT if not found * E_UNKOWN on error */ - { { "deregisterSource", "q" }, &org::genivi::am::deregisterSourceStubDispatcher }, + { { "deregisterSource", "q" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::deregisterSourceStubDispatcher }, /** * this function registers a crossfader. (at)return E_OK on succes, * E_ALREADY_EXISTENT if already registered E_UNKOWN on error */ - { { "registerCrossfader", "(qsqqqi)" }, &org::genivi::am::registerCrossfaderStubDispatcher }, + { { "registerCrossfader", "(qsqqqi)" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::registerCrossfaderStubDispatcher }, /** * this function deregisters a crossfader. removes all sources and sinks assiated * as well. (at)return E_OK on succes, E_NON_EXISTENT if not found E_UNKOWN on * error */ - { { "deregisterCrossfader", "q" }, &org::genivi::am::deregisterCrossfaderStubDispatcher }, + { { "deregisterCrossfader", "q" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::deregisterCrossfaderStubDispatcher }, /** * this function peeks a sourceclassID. It is used by the RoutingPlugins to * determine the SinkClassIDs of a sinkClass. (at)return E_OK on succes, * E_DATABASE_ERROR on error */ - { { "peekSourceClassID", "s" }, &org::genivi::am::peekSourceClassIDStubDispatcher }, + { { "peekSourceClassID", "s" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::peekSourceClassIDStubDispatcher }, /** * this function peeks a sourceclassID. It is used by the RoutingPlugins to * determine the SinkClassIDs of a sinkClass. (at)return E_OK on succes, * E_DATABASE_ERROR on error */ - { { "peekSinkClassID", "s" }, &org::genivi::am::peekSinkClassIDStubDispatcher }, + { { "peekSinkClassID", "s" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::peekSinkClassIDStubDispatcher }, /** * is called when a low level interrupt changes it status. */ - { { "hookInterruptStatusChange", "qi" }, &org::genivi::am::hookInterruptStatusChangeStubDispatcher }, + { { "hookInterruptStatusChange", "qi" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::hookInterruptStatusChangeStubDispatcher }, /** * This hook is called when all elements from a domain are registered. Is used by * the Controller to know when all expected domains are finally registered */ - { { "hookDomainRegistrationComplete", "q" }, &org::genivi::am::hookDomainRegistrationCompleteStubDispatcher }, + { { "hookDomainRegistrationComplete", "q" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::hookDomainRegistrationCompleteStubDispatcher }, /** * is called when a sink changes its availability */ - { { "hookSinkAvailablityStatusChange", "q(iq)" }, &org::genivi::am::hookSinkAvailablityStatusChangeStubDispatcher }, + { { "hookSinkAvailablityStatusChange", "q(iq)" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::hookSinkAvailablityStatusChangeStubDispatcher }, /** * is called when a source changes its availability */ - { { "hookSourceAvailablityStatusChange", "q(iq)" }, &org::genivi::am::hookSourceAvailablityStatusChangeStubDispatcher }, + { { "hookSourceAvailablityStatusChange", "q(iq)" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::hookSourceAvailablityStatusChangeStubDispatcher }, /** * is called when a domain changes its status. This used for early domains only */ - { { "hookDomainStateChange", "qi" }, &org::genivi::am::hookDomainStateChangeStubDispatcher }, + { { "hookDomainStateChange", "qi" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::hookDomainStateChangeStubDispatcher }, /** * is called when the timinginformation (delay) changed for a connection. */ - { { "hookTimingInformationChanged", "qn" }, &org::genivi::am::hookTimingInformationChangedStubDispatcher }, + { { "hookTimingInformationChanged", "qn" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::hookTimingInformationChangedStubDispatcher }, /** * this function is used to send out all data that has been changed in an early * state. (at)return E_OK on success, E_UNKNOWN on error */ - { { "sendChangedData", "a(i(yv)(yv))" }, &org::genivi::am::sendChangedDataStubDispatcher }, + { { "sendChangedData", "a(i(yv)(yv))" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::sendChangedDataStubDispatcher }, /** * updates data of an gateway. (at)return E_OK on success, E_NON_EXISTENT if the * gatewayID is not valid. */ - { { "updateGateway", "qaqaqab" }, &org::genivi::am::updateGatewayStubDispatcher }, + { { "updateGateway", "qaqaqab" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::updateGatewayStubDispatcher }, /** * updates data of an gateway. (at)return E_OK on success, E_NON_EXISTENT if the * sinkID is not valid. */ - { { "updateSink", "qqa(qn)aqa(qn)" }, &org::genivi::am::updateSinkStubDispatcher }, + { { "updateSink", "qqa(qn)aqa(qn)" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::updateSinkStubDispatcher }, /** * updates data of an source. (at)return E_OK on success, E_NON_EXISTENT if the * sourceID in the struct is not valid. - Please note that only the following - * data out of am_Source_s have effect when they are + Please note that only the following data + * out of am_Source_s have effect when they are * changed: sourceClassID, listSoundProperties, @@ -1133,31 +1139,36 @@ RoutingControlObserverDBusStubAdapterInternal::RoutingControlObserverDBusStubAda * listMainSoundProperties */ - { { "updateSource", "qqa(qn)aqa(qn)" }, &org::genivi::am::updateSourceStubDispatcher }, + { { "updateSource", "qqa(qn)aqa(qn)" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::updateSourceStubDispatcher }, /** * acknowledges a asyncSetSinkVolumes */ - { { "ackSetVolumes", "(iq)a(i(yv)nqn)i" }, &org::genivi::am::ackSetVolumesStubDispatcher }, + { { "ackSetVolumes", "(iq)a(i(yv)nqn)i" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::ackSetVolumesStubDispatcher }, /** * The acknowledge of the SinkNotificationConfiguration */ - { { "ackSinkNotificationConfiguration", "(iq)i" }, &org::genivi::am::ackSinkNotificationConfigurationStubDispatcher }, + { { "ackSinkNotificationConfiguration", "(iq)i" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::ackSinkNotificationConfigurationStubDispatcher }, /** * The acknowledge of the SourceNotificationConfiguration */ - { { "ackSourceNotificationConfiguration", "(iq)i" }, &org::genivi::am::ackSourceNotificationConfigurationStubDispatcher }, + { { "ackSourceNotificationConfiguration", "(iq)i" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::ackSourceNotificationConfigurationStubDispatcher }, /** * is called whenever a notified value needs to be send */ - { { "hookSinkNotificationDataChange", "q(qn)" }, &org::genivi::am::hookSinkNotificationDataChangeStubDispatcher }, + { { "hookSinkNotificationDataChange", "q(qn)" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::hookSinkNotificationDataChangeStubDispatcher }, /** * is called whenever a notified value needs to be send */ - { { "hookSourceNotificationDataChange", "q(qn)" }, &org::genivi::am::hookSourceNotificationDataChangeStubDispatcher }, - { { "confirmRoutingRundown", "s" }, &org::genivi::am::confirmRoutingRundownStubDispatcher } - }) { + { { "hookSourceNotificationDataChange", "q(qn)" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::hookSourceNotificationDataChangeStubDispatcher }, + { { "confirmRoutingRundown", "s" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::confirmRoutingRundownStubDispatcher } + }), + stubAttributeTable_() { + + stubDispatcherTable_.insert({ { "getInterfaceVersion", "" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::getRoutingControlObserverInterfaceVersionStubDispatcher }); +} - stubDispatcherTable_.insert({ { "getInterfaceVersion", "" }, &org::genivi::am::getRoutingControlObserverInterfaceVersionStubDispatcher }); +const bool RoutingControlObserverDBusStubAdapterInternal::hasFreedesktopProperties() { + return false; } } // namespace am diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusStubAdapter.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusStubAdapter.h index 144e86a..b896433 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusStubAdapter.h +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusStubAdapter.h @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.genivi.commonapi.core 2.1.6.v20140519. * Used org.franca.core 0.8.11.201401091023. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. @@ -33,7 +33,7 @@ namespace am { typedef CommonAPI::DBus::DBusStubAdapterHelper<RoutingControlObserverStub> RoutingControlObserverDBusStubAdapterHelper; -class RoutingControlObserverDBusStubAdapterInternal: public RoutingControlObserverStubAdapter, public RoutingControlObserverDBusStubAdapterHelper { +class RoutingControlObserverDBusStubAdapterInternal: public virtual RoutingControlObserverStubAdapter, public RoutingControlObserverDBusStubAdapterHelper { public: RoutingControlObserverDBusStubAdapterInternal( const std::shared_ptr<CommonAPI::DBus::DBusFactory>& factory, @@ -46,6 +46,8 @@ class RoutingControlObserverDBusStubAdapterInternal: public RoutingControlObserv ~RoutingControlObserverDBusStubAdapterInternal(); + virtual const bool hasFreedesktopProperties(); + /** * This attribute signals to the clients the current routing state. A client @@ -57,15 +59,442 @@ class RoutingControlObserverDBusStubAdapterInternal: public RoutingControlObserv const RoutingControlObserverDBusStubAdapterHelper::StubDispatcherTable& getStubDispatcherTable(); + const CommonAPI::DBus::StubAttributeTable& getStubAttributeTable(); void deactivateManagedInstances(); +static CommonAPI::DBus::DBusGetAttributeStubDispatcher< + RoutingControlObserverStub, + CommonAPI::Version + > getRoutingControlObserverInterfaceVersionStubDispatcher; + +/** + * This attribute signals to the clients the current routing state. +A client + * should notify himself to this attribute in order to know the current state and + * act accordingly. + */ +static CommonAPI::DBus::DBusGetAttributeStubDispatcher< + RoutingControlObserverStub, + am_RoutingReady_e + > getRoutingReadyAttributeStubDispatcher; + + +/** + * acknowledges a asyncConnect + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_Handle_s, am_connectionID_t, am_Error_e>, + std::tuple<> + > ackConnectStubDispatcher; +/** + * acknowledges a asyncDisconnect + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_Handle_s, am_connectionID_t, am_Error_e>, + std::tuple<> + > ackDisconnectStubDispatcher; +/** + * acknowledges a asyncsetSinkVolume + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_Handle_s, am_volume_t, am_Error_e>, + std::tuple<> + > ackSetSinkVolumeChangeStubDispatcher; +/** + * acknowledges a asyncsetSourceVolume + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_Handle_s, am_volume_t, am_Error_e>, + std::tuple<> + > ackSetSourceVolumeChangeStubDispatcher; +/** + * acknowlegde for asyncSetSourceState + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_Handle_s, am_Error_e>, + std::tuple<> + > ackSetSourceStateStubDispatcher; +/** + * acknowledges asyncSetSinkSoundProperties + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_Handle_s, am_Error_e>, + std::tuple<> + > ackSetSinkSoundPropertiesStubDispatcher; +/** + * acknowledges asyncSetSinkSoundProperty + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_Handle_s, am_Error_e>, + std::tuple<> + > ackSetSinkSoundPropertyStubDispatcher; +/** + * acknowledges asyncSetSourceSoundProperties + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_Handle_s, am_Error_e>, + std::tuple<> + > ackSetSourceSoundPropertiesStubDispatcher; +/** + * acknowledges asyncSetSourceSoundProperty + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_Handle_s, am_Error_e>, + std::tuple<> + > ackSetSourceSoundPropertyStubDispatcher; +/** + * acknowledges asyncCrossFade + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_Handle_s, am_HotSink_e, am_Error_e>, + std::tuple<> + > ackCrossFadingStubDispatcher; +/** + * acknowledges a volume tick. This can be used to display volumechanges during + * ramps + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_Handle_s, am_sourceID_t, am_volume_t>, + std::tuple<> + > ackSourceVolumeTickStubDispatcher; +/** + * acknowledges a volume tick. This can be used to display volumechanges during + * ramps + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_Handle_s, am_sinkID_t, am_volume_t>, + std::tuple<> + > ackSinkVolumeTickStubDispatcher; +/** + * This function returns the ID to the given domainName. If already a domain is + * registered with this name, it will return the corresponding ID, if not it will + * reserve an ID but not register the domain. The other parameters of the domain + * will be overwritten when the domain is registered. +(at)return E_OK on success, + * E_UNKNOWN on error + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<std::string>, + std::tuple<am_domainID_t, am_Error_e> + > peekDomainStubDispatcher; +/** + * registers a domain +(at)return E_OK on succes, E_ALREADY_EXISTENT if already + * registered E_UNKOWN on error + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_Domain_s, std::string, std::string>, + std::tuple<am_domainID_t, am_Error_e> + > registerDomainStubDispatcher; +/** + * deregisters a domain. All sources, sinks, gateways and crossfaders from that + * domain will be removed as well. +(at)return E_OK on succes, E_NON_EXISTENT if + * not found E_UNKOWN on error + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_domainID_t>, + std::tuple<am_Error_e> + > deregisterDomainStubDispatcher; +/** + * registers a gateway. (at)return E_OK on succes, E_ALREADY_EXISTENT if already + * registered E_UNKOWN on error + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_Gateway_s>, + std::tuple<am_gatewayID_t, am_Error_e> + > registerGatewayStubDispatcher; +/** + * deregisters a gateway. Also removes all sinks and sources of the controlling + * domain. +(at)return E_OK on succes, E_NON_EXISTENT if not found E_UNKOWN on + * error + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_gatewayID_t>, + std::tuple<am_Error_e> + > deregisterGatewayStubDispatcher; +/** + * This function returns the ID to the given sinkName. If already a sink is + * registered with this name, it will return the corresponding ID, if not it will + * reserve an ID but not register the sink. The other parameters of the sink will + * be overwritten when the sink is registered. +(at)return E_OK on success, + * E_UNKNOWN on error + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<std::string>, + std::tuple<am_sinkID_t, am_Error_e> + > peekSinkStubDispatcher; +/** + * Registers a sink. If the sink is part of a gateway, the listconnectionFormats + * is copied to the gatewayInformation +(at)return E_OK on succes, + * E_ALREADY_EXISTENT if already registered E_UNKOWN on error + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_Sink_s>, + std::tuple<am_sinkID_t, am_Error_e> + > registerSinkStubDispatcher; +/** + * deregisters a sink. +(at)return E_OK on succes, E_NON_EXISTENT if not found + * E_UNKOWN on error + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_sinkID_t>, + std::tuple<am_Error_e> + > deregisterSinkStubDispatcher; +/** + * This function returns the ID to the given sourceName. If already a source is + * registered with this name, it will return the corresponding ID, if not it will + * reserve an ID but not register the source. The other parameters of the source + * will be overwritten when the source is registered. +(at)return E_OK on success, + * E_UNKNOWN on error + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<std::string>, + std::tuple<am_sourceID_t, am_Error_e> + > peekSourceStubDispatcher; +/** + * registers a source. If the source is part of a gateway, the + * listconnectionFormats is copied to the gatewayInformation +(at)return E_OK on + * success, E_UNKNOWN on error, E_ALREADY_EXIST if either name or sourceID + * already exists + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_Source_s>, + std::tuple<am_sourceID_t, am_Error_e> + > registerSourceStubDispatcher; +/** + * deregisters a source +(at)return E_OK on succes, E_NON_EXISTENT if not found + * E_UNKOWN on error + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_sourceID_t>, + std::tuple<am_Error_e> + > deregisterSourceStubDispatcher; +/** + * this function registers a crossfader. +(at)return E_OK on succes, + * E_ALREADY_EXISTENT if already registered E_UNKOWN on error + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_Crossfader_s>, + std::tuple<am_crossfaderID_t, am_Error_e> + > registerCrossfaderStubDispatcher; +/** + * this function deregisters a crossfader. removes all sources and sinks assiated + * as well. +(at)return E_OK on succes, E_NON_EXISTENT if not found E_UNKOWN on + * error + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_crossfaderID_t>, + std::tuple<am_Error_e> + > deregisterCrossfaderStubDispatcher; +/** + * this function peeks a sourceclassID. It is used by the RoutingPlugins to + * determine the SinkClassIDs of a sinkClass. +(at)return E_OK on succes, + * E_DATABASE_ERROR on error + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<std::string>, + std::tuple<am_sourceClass_t, am_Error_e> + > peekSourceClassIDStubDispatcher; +/** + * this function peeks a sourceclassID. It is used by the RoutingPlugins to + * determine the SinkClassIDs of a sinkClass. +(at)return E_OK on succes, + * E_DATABASE_ERROR on error + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<std::string>, + std::tuple<am_sinkClass_t, am_Error_e> + > peekSinkClassIDStubDispatcher; +/** + * is called when a low level interrupt changes it status. + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_sourceID_t, am_InterruptState_e>, + std::tuple<> + > hookInterruptStatusChangeStubDispatcher; +/** + * This hook is called when all elements from a domain are registered. +Is used by + * the Controller to know when all expected domains are finally registered + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_domainID_t>, + std::tuple<> + > hookDomainRegistrationCompleteStubDispatcher; +/** + * is called when a sink changes its availability + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_sinkID_t, am_Availability_s>, + std::tuple<> + > hookSinkAvailablityStatusChangeStubDispatcher; +/** + * is called when a source changes its availability + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_sourceID_t, am_Availability_s>, + std::tuple<> + > hookSourceAvailablityStatusChangeStubDispatcher; +/** + * is called when a domain changes its status. This used for early domains only + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_domainID_t, am_DomainState_e>, + std::tuple<> + > hookDomainStateChangeStubDispatcher; +/** + * is called when the timinginformation (delay) changed for a connection. + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_connectionID_t, am_timeSync_t>, + std::tuple<> + > hookTimingInformationChangedStubDispatcher; +/** + * this function is used to send out all data that has been changed in an early + * state. +(at)return E_OK on success, E_UNKNOWN on error + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_EarlyData_L>, + std::tuple<> + > sendChangedDataStubDispatcher; +/** + * updates data of an gateway. (at)return E_OK on success, E_NON_EXISTENT if the + * gatewayID is not valid. + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_gatewayID_t, am_ConnectionFormat_L, am_ConnectionFormat_L, am_Convertion_L>, + std::tuple<am_Error_e> + > updateGatewayStubDispatcher; +/** + * updates data of an gateway. (at)return E_OK on success, E_NON_EXISTENT if the + * sinkID is not valid. + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_sinkID_t, am_sinkClass_t, am_SoundProperty_L, am_ConnectionFormat_L, am_MainSoundProperty_L>, + std::tuple<am_Error_e> + > updateSinkStubDispatcher; +/** + * updates data of an source. (at)return E_OK on success, E_NON_EXISTENT if the + * sourceID in the struct is not valid. +Please note that only the following data + * out of am_Source_s have effect when they are + * changed: +sourceClassID, +listSoundProperties, +listConnectionFormats, + * +listMainSoundProperties + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_sourceID_t, am_sourceClass_t, am_SoundProperty_L, am_ConnectionFormat_L, am_MainSoundProperty_L>, + std::tuple<am_Error_e> + > updateSourceStubDispatcher; +/** + * acknowledges a asyncSetSinkVolumes + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_Handle_s, am_Volumes_L, am_Error_e>, + std::tuple<> + > ackSetVolumesStubDispatcher; +/** + * The acknowledge of the SinkNotificationConfiguration + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_Handle_s, am_Error_e>, + std::tuple<> + > ackSinkNotificationConfigurationStubDispatcher; +/** + * The acknowledge of the SourceNotificationConfiguration + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_Handle_s, am_Error_e>, + std::tuple<> + > ackSourceNotificationConfigurationStubDispatcher; +/** + * is called whenever a notified value needs to be send + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_sinkID_t, am_NotificationPayload_s>, + std::tuple<> + > hookSinkNotificationDataChangeStubDispatcher; +/** + * is called whenever a notified value needs to be send + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_sourceID_t, am_NotificationPayload_s>, + std::tuple<> + > hookSourceNotificationDataChangeStubDispatcher; +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<std::string>, + std::tuple<> + > confirmRoutingRundownStubDispatcher; + + + + protected: virtual const char* getMethodsDBusIntrospectionXmlData() const; - - private: + + private: RoutingControlObserverDBusStubAdapterHelper::StubDispatcherTable stubDispatcherTable_; + CommonAPI::DBus::StubAttributeTable stubAttributeTable_; }; class RoutingControlObserverDBusStubAdapter: public RoutingControlObserverDBusStubAdapterInternal, public std::enable_shared_from_this<RoutingControlObserverDBusStubAdapter> { diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverProxy.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverProxy.h index 998e8ae..168e4e3 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverProxy.h +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverProxy.h @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.genivi.commonapi.core 2.1.6.v20140519. * Used org.franca.core 0.8.11.201401091023. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. @@ -325,8 +325,8 @@ public: * registered with this name, it will return the corresponding ID, if not it will * reserve an ID but not register the domain. The other parameters of the domain * will be overwritten when the domain is registered. - (at)return E_OK on - * success, E_UNKNOWN on error + (at)return E_OK on success, + * E_UNKNOWN on error * * Calls peekDomain with synchronous semantics. * @@ -533,8 +533,8 @@ public: * registered with this name, it will return the corresponding ID, if not it will * reserve an ID but not register the source. The other parameters of the source * will be overwritten when the source is registered. - (at)return E_OK on - * success, E_UNKNOWN on error + (at)return E_OK on success, + * E_UNKNOWN on error * * Calls peekSource with synchronous semantics. * @@ -920,8 +920,8 @@ public: /** * updates data of an source. (at)return E_OK on success, E_NON_EXISTENT if the * sourceID in the struct is not valid. - Please note that only the following - * data out of am_Source_s have effect when they are + Please note that only the following data + * out of am_Source_s have effect when they are * changed: sourceClassID, listSoundProperties, @@ -1127,6 +1127,12 @@ public: std::shared_ptr<RoutingControlObserverProxyBase> delegate_; }; +#ifdef WIN32 + typedef RoutingControlObserverProxy<CommonAPI::WINDummyAttributeExtension<CommonAPI::WINDummyAttribute>> RoutingControlObserverProxyDefault; +#else + typedef RoutingControlObserverProxy<> RoutingControlObserverProxyDefault; +#endif + namespace RoutingControlObserverExtensions { /** * This attribute signals to the clients the current routing state. @@ -1141,6 +1147,9 @@ namespace RoutingControlObserverExtensions { static_assert(std::is_base_of<typename CommonAPI::AttributeExtension<RoutingControlObserverProxyBase::RoutingReadyAttribute>, extension_type>::value, "Not CommonAPI Attribute Extension!"); + #ifdef WIN32 + RoutingReadyAttributeExtension() {} + #endif RoutingReadyAttributeExtension(RoutingControlObserverProxyBase& proxy): attributeExtension_(proxy.getRoutingReadyAttribute()) { } @@ -1160,8 +1169,8 @@ namespace RoutingControlObserverExtensions { // template <typename ... _AttributeExtensions> RoutingControlObserverProxy<_AttributeExtensions...>::RoutingControlObserverProxy(std::shared_ptr<CommonAPI::Proxy> delegate): - delegate_(std::dynamic_pointer_cast<RoutingControlObserverProxyBase>(delegate)), - _AttributeExtensions(*(std::dynamic_pointer_cast<RoutingControlObserverProxyBase>(delegate)))... { + _AttributeExtensions(*(std::dynamic_pointer_cast<RoutingControlObserverProxyBase>(delegate)))..., + delegate_(std::dynamic_pointer_cast<RoutingControlObserverProxyBase>(delegate)) { } template <typename ... _AttributeExtensions> @@ -1319,8 +1328,8 @@ std::future<CommonAPI::CallStatus> RoutingControlObserverProxy<_AttributeExtensi * registered with this name, it will return the corresponding ID, if not it will * reserve an ID but not register the domain. The other parameters of the domain * will be overwritten when the domain is registered. -(at)return E_OK on - * success, E_UNKNOWN on error +(at)return E_OK on success, + * E_UNKNOWN on error */ template <typename ... _AttributeExtensions> void RoutingControlObserverProxy<_AttributeExtensions...>::peekDomain(const std::string& name, CommonAPI::CallStatus& callStatus, am_domainID_t& domainID, am_Error_e& error) { @@ -1439,8 +1448,8 @@ std::future<CommonAPI::CallStatus> RoutingControlObserverProxy<_AttributeExtensi * registered with this name, it will return the corresponding ID, if not it will * reserve an ID but not register the source. The other parameters of the source * will be overwritten when the source is registered. -(at)return E_OK on - * success, E_UNKNOWN on error +(at)return E_OK on success, + * E_UNKNOWN on error */ template <typename ... _AttributeExtensions> void RoutingControlObserverProxy<_AttributeExtensions...>::peekSource(const std::string& name, CommonAPI::CallStatus& callStatus, am_sourceID_t& sourceID, am_Error_e& error) { @@ -1657,8 +1666,8 @@ std::future<CommonAPI::CallStatus> RoutingControlObserverProxy<_AttributeExtensi /** * updates data of an source. (at)return E_OK on success, E_NON_EXISTENT if the * sourceID in the struct is not valid. -Please note that only the following - * data out of am_Source_s have effect when they are +Please note that only the following data + * out of am_Source_s have effect when they are * changed: sourceClassID, listSoundProperties, diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverProxyBase.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverProxyBase.h index fa80989..0e9cb01 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverProxyBase.h +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverProxyBase.h @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.genivi.commonapi.core 2.1.6.v20140519. * Used org.franca.core 0.8.11.201401091023. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. @@ -165,8 +165,8 @@ class RoutingControlObserverProxyBase: virtual public CommonAPI::Proxy { * registered with this name, it will return the corresponding ID, if not it will * reserve an ID but not register the domain. The other parameters of the domain * will be overwritten when the domain is registered. - (at)return E_OK on - * success, E_UNKNOWN on error + (at)return E_OK on success, + * E_UNKNOWN on error */ virtual void peekDomain(const std::string& name, CommonAPI::CallStatus& callStatus, am_domainID_t& domainID, am_Error_e& error) = 0; virtual std::future<CommonAPI::CallStatus> peekDomainAsync(const std::string& name, PeekDomainAsyncCallback callback) = 0; @@ -229,8 +229,8 @@ class RoutingControlObserverProxyBase: virtual public CommonAPI::Proxy { * registered with this name, it will return the corresponding ID, if not it will * reserve an ID but not register the source. The other parameters of the source * will be overwritten when the source is registered. - (at)return E_OK on - * success, E_UNKNOWN on error + (at)return E_OK on success, + * E_UNKNOWN on error */ virtual void peekSource(const std::string& name, CommonAPI::CallStatus& callStatus, am_sourceID_t& sourceID, am_Error_e& error) = 0; virtual std::future<CommonAPI::CallStatus> peekSourceAsync(const std::string& name, PeekSourceAsyncCallback callback) = 0; @@ -335,8 +335,8 @@ class RoutingControlObserverProxyBase: virtual public CommonAPI::Proxy { /** * updates data of an source. (at)return E_OK on success, E_NON_EXISTENT if the * sourceID in the struct is not valid. - Please note that only the following - * data out of am_Source_s have effect when they are + Please note that only the following data + * out of am_Source_s have effect when they are * changed: sourceClassID, listSoundProperties, diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStub.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStub.h index eb61414..214505e 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStub.h +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStub.h @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.genivi.commonapi.core 2.1.6.v20140519. * Used org.franca.core 0.8.11.201401091023. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. @@ -87,7 +87,7 @@ class RoutingControlObserverStubRemoteEvent { * This class and the one above are the ones an application developer needs to have * a look at if he wants to implement a service. */ -class RoutingControlObserverStub : public virtual CommonAPI::Stub<RoutingControlObserverStubAdapter, RoutingControlObserverStubRemoteEvent> { +class RoutingControlObserverStub: public virtual CommonAPI::Stub<RoutingControlObserverStubAdapter, RoutingControlObserverStubRemoteEvent> { public: virtual ~RoutingControlObserverStub() { } virtual const CommonAPI::Version& getInterfaceVersion(std::shared_ptr<CommonAPI::ClientId> clientId) = 0; @@ -168,8 +168,8 @@ public: * registered with this name, it will return the corresponding ID, if not it will * reserve an ID but not register the domain. The other parameters of the domain * will be overwritten when the domain is registered. - (at)return E_OK on - * success, E_UNKNOWN on error + (at)return E_OK on success, + * E_UNKNOWN on error */ /// This is the method that will be called on remote calls on the method peekDomain. virtual void peekDomain(const std::shared_ptr<CommonAPI::ClientId> clientId, std::string name, am_domainID_t& domainID, am_Error_e& error) = 0; @@ -232,8 +232,8 @@ public: * registered with this name, it will return the corresponding ID, if not it will * reserve an ID but not register the source. The other parameters of the source * will be overwritten when the source is registered. - (at)return E_OK on - * success, E_UNKNOWN on error + (at)return E_OK on success, + * E_UNKNOWN on error */ /// This is the method that will be called on remote calls on the method peekSource. virtual void peekSource(const std::shared_ptr<CommonAPI::ClientId> clientId, std::string name, am_sourceID_t& sourceID, am_Error_e& error) = 0; @@ -338,8 +338,8 @@ public: /** * updates data of an source. (at)return E_OK on success, E_NON_EXISTENT if the * sourceID in the struct is not valid. - Please note that only the following - * data out of am_Source_s have effect when they are + Please note that only the following data + * out of am_Source_s have effect when they are * changed: sourceClassID, listSoundProperties, @@ -380,6 +380,8 @@ public: using CommonAPI::Stub<RoutingControlObserverStubAdapter, RoutingControlObserverStubRemoteEvent>::initStubAdapter; typedef CommonAPI::Stub<RoutingControlObserverStubAdapter, RoutingControlObserverStubRemoteEvent>::StubAdapterType StubAdapterType; typedef CommonAPI::Stub<RoutingControlObserverStubAdapter, RoutingControlObserverStubRemoteEvent>::RemoteEventHandlerType RemoteEventHandlerType; + typedef RoutingControlObserverStubRemoteEvent RemoteEventType; + typedef RoutingControlObserver StubInterface; }; } // namespace am diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStubDefault.cpp b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStubDefault.cpp index 46d10f7..a755188 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStubDefault.cpp +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStubDefault.cpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.genivi.commonapi.core 2.1.6.v20140519. * Used org.franca.core 0.8.11.201401091023. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. @@ -37,7 +37,7 @@ const am_RoutingReady_e& RoutingControlObserverStubDefault::getRoutingReadyAttri void RoutingControlObserverStubDefault::setRoutingReadyAttribute(am_RoutingReady_e value) { const bool valueChanged = trySetRoutingReadyAttribute(std::move(value)); - if (valueChanged) { + if (valueChanged && stubAdapter_ != NULL) { stubAdapter_->fireRoutingReadyAttributeChanged(routingReadyAttributeValue_); } } @@ -196,8 +196,8 @@ void RoutingControlObserverStubDefault::ackSinkVolumeTick(am_Handle_s handle, am * registered with this name, it will return the corresponding ID, if not it will * reserve an ID but not register the domain. The other parameters of the domain * will be overwritten when the domain is registered. -(at)return E_OK on - * success, E_UNKNOWN on error +(at)return E_OK on success, + * E_UNKNOWN on error */ void RoutingControlObserverStubDefault::peekDomain(const std::shared_ptr<CommonAPI::ClientId> clientId, std::string name, am_domainID_t& domainID, am_Error_e& error) { // Call old style methods in default @@ -308,8 +308,8 @@ void RoutingControlObserverStubDefault::deregisterSink(am_sinkID_t sinkID, am_Er * registered with this name, it will return the corresponding ID, if not it will * reserve an ID but not register the source. The other parameters of the source * will be overwritten when the source is registered. -(at)return E_OK on - * success, E_UNKNOWN on error +(at)return E_OK on success, + * E_UNKNOWN on error */ void RoutingControlObserverStubDefault::peekSource(const std::shared_ptr<CommonAPI::ClientId> clientId, std::string name, am_sourceID_t& sourceID, am_Error_e& error) { // Call old style methods in default @@ -510,8 +510,8 @@ void RoutingControlObserverStubDefault::updateSink(am_sinkID_t sinkID, am_sinkCl /** * updates data of an source. (at)return E_OK on success, E_NON_EXISTENT if the * sourceID in the struct is not valid. -Please note that only the following - * data out of am_Source_s have effect when they are +Please note that only the following data + * out of am_Source_s have effect when they are * changed: sourceClassID, listSoundProperties, diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStubDefault.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStubDefault.h index 0d19077..8145840 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStubDefault.h +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStubDefault.h @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.genivi.commonapi.core 2.1.6.v20140519. * Used org.franca.core 0.8.11.201401091023. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. @@ -123,8 +123,8 @@ public: * registered with this name, it will return the corresponding ID, if not it will * reserve an ID but not register the domain. The other parameters of the domain * will be overwritten when the domain is registered. - (at)return E_OK on - * success, E_UNKNOWN on error + (at)return E_OK on success, + * E_UNKNOWN on error */ virtual void peekDomain(const std::shared_ptr<CommonAPI::ClientId> clientId, std::string name, am_domainID_t& domainID, am_Error_e& error); virtual void peekDomain(std::string name, am_domainID_t& domainID, am_Error_e& error); @@ -195,8 +195,8 @@ public: * registered with this name, it will return the corresponding ID, if not it will * reserve an ID but not register the source. The other parameters of the source * will be overwritten when the source is registered. - (at)return E_OK on - * success, E_UNKNOWN on error + (at)return E_OK on success, + * E_UNKNOWN on error */ virtual void peekSource(const std::shared_ptr<CommonAPI::ClientId> clientId, std::string name, am_sourceID_t& sourceID, am_Error_e& error); virtual void peekSource(std::string name, am_sourceID_t& sourceID, am_Error_e& error); @@ -317,8 +317,8 @@ public: /** * updates data of an source. (at)return E_OK on success, E_NON_EXISTENT if the * sourceID in the struct is not valid. - Please note that only the following - * data out of am_Source_s have effect when they are + Please note that only the following data + * out of am_Source_s have effect when they are * changed: sourceClassID, listSoundProperties, @@ -374,8 +374,7 @@ protected: */ virtual bool trySetRoutingReadyAttribute(am_RoutingReady_e value); virtual bool validateRoutingReadyAttributeRequestedValue(const am_RoutingReady_e& value); -private: - class RemoteEventHandler: public RoutingControlObserverStubRemoteEvent { + class RemoteEventHandler: public virtual RoutingControlObserverStubRemoteEvent { public: RemoteEventHandler(RoutingControlObserverStubDefault* defaultStub); @@ -390,8 +389,8 @@ private: private: RoutingControlObserverStubDefault* defaultStub_; }; - - RemoteEventHandler remoteEventHandler_; +private: + RoutingControlObserverStubDefault::RemoteEventHandler remoteEventHandler_; /** * This attribute signals to the clients the current routing state. diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlProxy.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlProxy.h index 4cc1ba0..a2721d3 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlProxy.h +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlProxy.h @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.genivi.commonapi.core 2.1.6.v20140519. * Used org.franca.core 0.8.11.201401091023. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. @@ -67,7 +67,7 @@ public: /** * connects a source to a sink (at)return E_OK on success, E_UNKNOWN on error, - * E_WRONG_FORMAT in case am_CustomConnectionFormat_t does not match + * E_WRONG_FORMAT in case am_ConnectionFormat_e does not match * * Calls asyncConnect with synchronous semantics. * @@ -192,8 +192,8 @@ public: virtual std::future<CommonAPI::CallStatus> asyncSetSourceStateAsync(const am_Handle_s& handle, const am_sourceID_t& sourceID, const am_SourceState_e& state, AsyncSetSourceStateAsyncCallback callback); /** * this function sets the sinksoundproperty. - (at)return E_OK on success, - * E_UNKNOWN on error, E_OUT_OF_RANGE in case the propery value is out of range + (at)return E_OK on success, E_UNKNOWN + * on error, E_OUT_OF_RANGE in case the propery value is out of range * * Calls asyncSetSinkSoundProperties with synchronous semantics. * @@ -216,8 +216,8 @@ public: virtual std::future<CommonAPI::CallStatus> asyncSetSinkSoundPropertiesAsync(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_SoundProperty_L& listSoundProperties, AsyncSetSinkSoundPropertiesAsyncCallback callback); /** * this function sets the sinksoundproperty. - (at)return E_OK on success, - * E_UNKNOWN on error, E_OUT_OF_RANGE in case the propery value is out of range + (at)return E_OK on success, E_UNKNOWN + * on error, E_OUT_OF_RANGE in case the propery value is out of range * * Calls asyncSetSinkSoundProperty with synchronous semantics. * @@ -443,14 +443,20 @@ public: std::shared_ptr<RoutingControlProxyBase> delegate_; }; +#ifdef WIN32 + typedef RoutingControlProxy<CommonAPI::WINDummyAttributeExtension<CommonAPI::WINDummyAttribute>> RoutingControlProxyDefault; +#else + typedef RoutingControlProxy<> RoutingControlProxyDefault; +#endif + // // RoutingControlProxy Implementation // template <typename ... _AttributeExtensions> RoutingControlProxy<_AttributeExtensions...>::RoutingControlProxy(std::shared_ptr<CommonAPI::Proxy> delegate): - delegate_(std::dynamic_pointer_cast<RoutingControlProxyBase>(delegate)), - _AttributeExtensions(*(std::dynamic_pointer_cast<RoutingControlProxyBase>(delegate)))... { + _AttributeExtensions(*(std::dynamic_pointer_cast<RoutingControlProxyBase>(delegate)))..., + delegate_(std::dynamic_pointer_cast<RoutingControlProxyBase>(delegate)) { } template <typename ... _AttributeExtensions> @@ -474,7 +480,7 @@ std::future<CommonAPI::CallStatus> RoutingControlProxy<_AttributeExtensions...>: /** * connects a source to a sink (at)return E_OK on success, E_UNKNOWN on error, - * E_WRONG_FORMAT in case am_CustomConnectionFormat_t does not match + * E_WRONG_FORMAT in case am_ConnectionFormat_e does not match */ template <typename ... _AttributeExtensions> void RoutingControlProxy<_AttributeExtensions...>::asyncConnect(const am_Handle_s& handle, const am_connectionID_t& connectionID, const am_sourceID_t& sourceID, const am_sinkID_t& sinkID, const am_CustomConnectionFormat_t& connectionFormat, CommonAPI::CallStatus& callStatus) { @@ -549,8 +555,8 @@ std::future<CommonAPI::CallStatus> RoutingControlProxy<_AttributeExtensions...>: } /** * this function sets the sinksoundproperty. -(at)return E_OK on success, - * E_UNKNOWN on error, E_OUT_OF_RANGE in case the propery value is out of range +(at)return E_OK on success, E_UNKNOWN + * on error, E_OUT_OF_RANGE in case the propery value is out of range */ template <typename ... _AttributeExtensions> void RoutingControlProxy<_AttributeExtensions...>::asyncSetSinkSoundProperties(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_SoundProperty_L& listSoundProperties, CommonAPI::CallStatus& callStatus) { @@ -563,8 +569,8 @@ std::future<CommonAPI::CallStatus> RoutingControlProxy<_AttributeExtensions...>: } /** * this function sets the sinksoundproperty. -(at)return E_OK on success, - * E_UNKNOWN on error, E_OUT_OF_RANGE in case the propery value is out of range +(at)return E_OK on success, E_UNKNOWN + * on error, E_OUT_OF_RANGE in case the propery value is out of range */ template <typename ... _AttributeExtensions> void RoutingControlProxy<_AttributeExtensions...>::asyncSetSinkSoundProperty(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_SoundProperty_s& soundProperty, CommonAPI::CallStatus& callStatus) { diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlProxyBase.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlProxyBase.h index 75bba47..802c881 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlProxyBase.h +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlProxyBase.h @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.genivi.commonapi.core 2.1.6.v20140519. * Used org.franca.core 0.8.11.201401091023. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. @@ -70,7 +70,7 @@ class RoutingControlProxyBase: virtual public CommonAPI::Proxy { /** * connects a source to a sink (at)return E_OK on success, E_UNKNOWN on error, - * E_WRONG_FORMAT in case am_CustomConnectionFormat_t does not match + * E_WRONG_FORMAT in case am_ConnectionFormat_e does not match */ virtual void asyncConnect(const am_Handle_s& handle, const am_connectionID_t& connectionID, const am_sourceID_t& sourceID, const am_sinkID_t& sinkID, const am_CustomConnectionFormat_t& connectionFormat, CommonAPI::CallStatus& callStatus) = 0; virtual std::future<CommonAPI::CallStatus> asyncConnectAsync(const am_Handle_s& handle, const am_connectionID_t& connectionID, const am_sourceID_t& sourceID, const am_sinkID_t& sinkID, const am_CustomConnectionFormat_t& connectionFormat, AsyncConnectAsyncCallback callback) = 0; @@ -110,15 +110,15 @@ class RoutingControlProxyBase: virtual public CommonAPI::Proxy { virtual std::future<CommonAPI::CallStatus> asyncSetSourceStateAsync(const am_Handle_s& handle, const am_sourceID_t& sourceID, const am_SourceState_e& state, AsyncSetSourceStateAsyncCallback callback) = 0; /** * this function sets the sinksoundproperty. - (at)return E_OK on success, - * E_UNKNOWN on error, E_OUT_OF_RANGE in case the propery value is out of range + (at)return E_OK on success, E_UNKNOWN + * on error, E_OUT_OF_RANGE in case the propery value is out of range */ virtual void asyncSetSinkSoundProperties(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_SoundProperty_L& listSoundProperties, CommonAPI::CallStatus& callStatus) = 0; virtual std::future<CommonAPI::CallStatus> asyncSetSinkSoundPropertiesAsync(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_SoundProperty_L& listSoundProperties, AsyncSetSinkSoundPropertiesAsyncCallback callback) = 0; /** * this function sets the sinksoundproperty. - (at)return E_OK on success, - * E_UNKNOWN on error, E_OUT_OF_RANGE in case the propery value is out of range + (at)return E_OK on success, E_UNKNOWN + * on error, E_OUT_OF_RANGE in case the propery value is out of range */ virtual void asyncSetSinkSoundProperty(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_SoundProperty_s& soundProperty, CommonAPI::CallStatus& callStatus) = 0; virtual std::future<CommonAPI::CallStatus> asyncSetSinkSoundPropertyAsync(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_SoundProperty_s& soundProperty, AsyncSetSinkSoundPropertyAsyncCallback callback) = 0; diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlStub.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlStub.h index 5303589..9b027e9 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlStub.h +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlStub.h @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.genivi.commonapi.core 2.1.6.v20140519. * Used org.franca.core 0.8.11.201401091023. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. @@ -83,7 +83,7 @@ class RoutingControlStubRemoteEvent { * This class and the one above are the ones an application developer needs to have * a look at if he wants to implement a service. */ -class RoutingControlStub : public virtual CommonAPI::Stub<RoutingControlStubAdapter, RoutingControlStubRemoteEvent> { +class RoutingControlStub: public virtual CommonAPI::Stub<RoutingControlStubAdapter, RoutingControlStubRemoteEvent> { public: virtual ~RoutingControlStub() { } virtual const CommonAPI::Version& getInterfaceVersion(std::shared_ptr<CommonAPI::ClientId> clientId) = 0; @@ -99,7 +99,7 @@ public: /** * connects a source to a sink (at)return E_OK on success, E_UNKNOWN on error, - * E_WRONG_FORMAT in case am_CustomConnectionFormat_t does not match + * E_WRONG_FORMAT in case am_ConnectionFormat_e does not match */ /// This is the method that will be called on remote calls on the method asyncConnect. virtual void asyncConnect(const std::shared_ptr<CommonAPI::ClientId> clientId, am_Handle_s handle, am_connectionID_t connectionID, am_sourceID_t sourceID, am_sinkID_t sinkID, am_CustomConnectionFormat_t connectionFormat) = 0; @@ -139,15 +139,15 @@ public: virtual void asyncSetSourceState(const std::shared_ptr<CommonAPI::ClientId> clientId, am_Handle_s handle, am_sourceID_t sourceID, am_SourceState_e state) = 0; /** * this function sets the sinksoundproperty. - (at)return E_OK on success, - * E_UNKNOWN on error, E_OUT_OF_RANGE in case the propery value is out of range + (at)return E_OK on success, E_UNKNOWN + * on error, E_OUT_OF_RANGE in case the propery value is out of range */ /// This is the method that will be called on remote calls on the method asyncSetSinkSoundProperties. virtual void asyncSetSinkSoundProperties(const std::shared_ptr<CommonAPI::ClientId> clientId, am_Handle_s handle, am_sinkID_t sinkID, am_SoundProperty_L listSoundProperties) = 0; /** * this function sets the sinksoundproperty. - (at)return E_OK on success, - * E_UNKNOWN on error, E_OUT_OF_RANGE in case the propery value is out of range + (at)return E_OK on success, E_UNKNOWN + * on error, E_OUT_OF_RANGE in case the propery value is out of range */ /// This is the method that will be called on remote calls on the method asyncSetSinkSoundProperty. virtual void asyncSetSinkSoundProperty(const std::shared_ptr<CommonAPI::ClientId> clientId, am_Handle_s handle, am_sinkID_t sinkID, am_SoundProperty_s soundProperty) = 0; @@ -189,6 +189,8 @@ public: using CommonAPI::Stub<RoutingControlStubAdapter, RoutingControlStubRemoteEvent>::initStubAdapter; typedef CommonAPI::Stub<RoutingControlStubAdapter, RoutingControlStubRemoteEvent>::StubAdapterType StubAdapterType; typedef CommonAPI::Stub<RoutingControlStubAdapter, RoutingControlStubRemoteEvent>::RemoteEventHandlerType RemoteEventHandlerType; + typedef RoutingControlStubRemoteEvent RemoteEventType; + typedef RoutingControl StubInterface; }; } // namespace am diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlStubDefault.cpp b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlStubDefault.cpp index 77e34e4..e2372f0 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlStubDefault.cpp +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlStubDefault.cpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.genivi.commonapi.core 2.1.6.v20140519. * Used org.franca.core 0.8.11.201401091023. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. @@ -44,7 +44,7 @@ void RoutingControlStubDefault::asyncAbort(am_Handle_s handle) { /** * connects a source to a sink (at)return E_OK on success, E_UNKNOWN on error, - * E_WRONG_FORMAT in case am_CustomConnectionFormat_t does not match + * E_WRONG_FORMAT in case am_ConnectionFormat_e does not match */ void RoutingControlStubDefault::asyncConnect(const std::shared_ptr<CommonAPI::ClientId> clientId, am_Handle_s handle, am_connectionID_t connectionID, am_sourceID_t sourceID, am_sinkID_t sinkID, am_CustomConnectionFormat_t connectionFormat) { // Call old style methods in default @@ -114,8 +114,8 @@ void RoutingControlStubDefault::asyncSetSourceState(am_Handle_s handle, am_sourc /** * this function sets the sinksoundproperty. -(at)return E_OK on success, - * E_UNKNOWN on error, E_OUT_OF_RANGE in case the propery value is out of range +(at)return E_OK on success, E_UNKNOWN + * on error, E_OUT_OF_RANGE in case the propery value is out of range */ void RoutingControlStubDefault::asyncSetSinkSoundProperties(const std::shared_ptr<CommonAPI::ClientId> clientId, am_Handle_s handle, am_sinkID_t sinkID, am_SoundProperty_L listSoundProperties) { // Call old style methods in default @@ -127,8 +127,8 @@ void RoutingControlStubDefault::asyncSetSinkSoundProperties(am_Handle_s handle, /** * this function sets the sinksoundproperty. -(at)return E_OK on success, - * E_UNKNOWN on error, E_OUT_OF_RANGE in case the propery value is out of range +(at)return E_OK on success, E_UNKNOWN + * on error, E_OUT_OF_RANGE in case the propery value is out of range */ void RoutingControlStubDefault::asyncSetSinkSoundProperty(const std::shared_ptr<CommonAPI::ClientId> clientId, am_Handle_s handle, am_sinkID_t sinkID, am_SoundProperty_s soundProperty) { // Call old style methods in default diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlStubDefault.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlStubDefault.h index f411112..cc67547 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlStubDefault.h +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlStubDefault.h @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.genivi.commonapi.core 2.1.6.v20140519. * Used org.franca.core 0.8.11.201401091023. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. @@ -52,7 +52,7 @@ public: /** * connects a source to a sink (at)return E_OK on success, E_UNKNOWN on error, - * E_WRONG_FORMAT in case am_CustomConnectionFormat_t does not match + * E_WRONG_FORMAT in case am_ConnectionFormat_e does not match */ virtual void asyncConnect(const std::shared_ptr<CommonAPI::ClientId> clientId, am_Handle_s handle, am_connectionID_t connectionID, am_sourceID_t sourceID, am_sinkID_t sinkID, am_CustomConnectionFormat_t connectionFormat); virtual void asyncConnect(am_Handle_s handle, am_connectionID_t connectionID, am_sourceID_t sourceID, am_sinkID_t sinkID, am_CustomConnectionFormat_t connectionFormat); @@ -97,16 +97,16 @@ public: /** * this function sets the sinksoundproperty. - (at)return E_OK on success, - * E_UNKNOWN on error, E_OUT_OF_RANGE in case the propery value is out of range + (at)return E_OK on success, E_UNKNOWN + * on error, E_OUT_OF_RANGE in case the propery value is out of range */ virtual void asyncSetSinkSoundProperties(const std::shared_ptr<CommonAPI::ClientId> clientId, am_Handle_s handle, am_sinkID_t sinkID, am_SoundProperty_L listSoundProperties); virtual void asyncSetSinkSoundProperties(am_Handle_s handle, am_sinkID_t sinkID, am_SoundProperty_L listSoundProperties); /** * this function sets the sinksoundproperty. - (at)return E_OK on success, - * E_UNKNOWN on error, E_OUT_OF_RANGE in case the propery value is out of range + (at)return E_OK on success, E_UNKNOWN + * on error, E_OUT_OF_RANGE in case the propery value is out of range */ virtual void asyncSetSinkSoundProperty(const std::shared_ptr<CommonAPI::ClientId> clientId, am_Handle_s handle, am_sinkID_t sinkID, am_SoundProperty_s soundProperty); virtual void asyncSetSinkSoundProperty(am_Handle_s handle, am_sinkID_t sinkID, am_SoundProperty_s soundProperty); @@ -156,8 +156,7 @@ public: protected: -private: - class RemoteEventHandler: public RoutingControlStubRemoteEvent { + class RemoteEventHandler: public virtual RoutingControlStubRemoteEvent { public: RemoteEventHandler(RoutingControlStubDefault* defaultStub); @@ -165,8 +164,8 @@ private: private: RoutingControlStubDefault* defaultStub_; }; - - RemoteEventHandler remoteEventHandler_; +private: + RoutingControlStubDefault::RemoteEventHandler remoteEventHandler_; CommonAPI::Version interfaceVersion_; |