diff options
Diffstat (limited to 'AudioManagerDaemon/src-gen/org/genivi')
20 files changed, 613 insertions, 184 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_; |